Commit 5080a08d authored by Ulf Hansson's avatar Ulf Hansson

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: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 3faf80df
...@@ -1500,13 +1500,10 @@ static int mmci_probe(struct amba_device *dev, ...@@ -1500,13 +1500,10 @@ static int mmci_probe(struct amba_device *dev,
* If no maximum operating frequency is supplied, fall back to use * If no maximum operating frequency is supplied, fall back to use
* the module parameter, which has a (low) default value in case it * the module parameter, which has a (low) default value in case it
* is not specified. Either value must not exceed the clock rate into * is not specified. Either value must not exceed the clock rate into
* the block, of course. Also note that DT takes precedence over * the block, of course.
* platform data.
*/ */
if (mmc->f_max) if (mmc->f_max)
mmc->f_max = min(host->mclk, 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 else
mmc->f_max = min(host->mclk, fmax); mmc->f_max = min(host->mclk, fmax);
dev_dbg(mmc_dev(mmc), "clocking block at %u Hz\n", mmc->f_max); dev_dbg(mmc_dev(mmc), "clocking block at %u Hz\n", mmc->f_max);
......
...@@ -12,9 +12,6 @@ struct dma_chan; ...@@ -12,9 +12,6 @@ struct dma_chan;
/** /**
* struct mmci_platform_data - platform configuration for the MMCI * struct mmci_platform_data - platform configuration for the MMCI
* (also known as PL180) block. * (also known as PL180) block.
* @f_max: the maximum operational frequency for this host in this
* platform configuration. When this is specified it takes precedence
* over the module parameter for the same frequency.
* @ocr_mask: available voltages on the 4 pins from the block, this * @ocr_mask: available voltages on the 4 pins from the block, this
* is ignored if a regulator is used, see the MMC_VDD_* masks in * is ignored if a regulator is used, see the MMC_VDD_* masks in
* mmc/host.h * mmc/host.h
...@@ -42,7 +39,6 @@ struct dma_chan; ...@@ -42,7 +39,6 @@ struct dma_chan;
* bidirectional channel * bidirectional channel
*/ */
struct mmci_platform_data { struct mmci_platform_data {
unsigned int f_max;
unsigned int ocr_mask; unsigned int ocr_mask;
int (*ios_handler)(struct device *, struct mmc_ios *); int (*ios_handler)(struct device *, struct mmc_ios *);
unsigned int (*status)(struct device *); unsigned int (*status)(struct device *);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment