diff options
author | Ulf Hansson <ulf.hansson@linaro.org> | 2014-03-21 10:46:39 +0100 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2014-05-20 06:06:56 +0200 |
commit | 5080a08d0f8a4b2ba3a15e5ddc5ece84a444cad8 (patch) | |
tree | e1e6c873a8cd61f469b8b9146bada65bc6ca7b6a /drivers/mmc/host/mmci.c | |
parent | 3faf80dfa342e98b5780e0b78b7a670c7b61a9be (diff) | |
download | blackbird-op-linux-5080a08d0f8a4b2ba3a15e5ddc5ece84a444cad8.tar.gz blackbird-op-linux-5080a08d0f8a4b2ba3a15e5ddc5ece84a444cad8.zip |
mmc: mmci: Enforce max frequency configuration through DT
Remove the option to provide a maximum frequency as platform data,
enforce it through DT.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/host/mmci.c')
-rw-r--r-- | drivers/mmc/host/mmci.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 9c60325f1a30..758efea184c9 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -1500,13 +1500,10 @@ static int mmci_probe(struct amba_device *dev, * If no maximum operating frequency is supplied, fall back to use * the module parameter, which has a (low) default value in case it * is not specified. Either value must not exceed the clock rate into - * the block, of course. Also note that DT takes precedence over - * platform data. + * the block, of course. */ if (mmc->f_max) mmc->f_max = min(host->mclk, mmc->f_max); - else if (plat->f_max) - mmc->f_max = min(host->mclk, plat->f_max); else mmc->f_max = min(host->mclk, fmax); dev_dbg(mmc_dev(mmc), "clocking block at %u Hz\n", mmc->f_max); |