Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -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);
+0 −4
Original line number Diff line number Diff line
@@ -12,9 +12,6 @@ struct dma_chan;
/**
 * struct mmci_platform_data - platform configuration for the MMCI
 * (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
 * is ignored if a regulator is used, see the MMC_VDD_* masks in
 * mmc/host.h
@@ -42,7 +39,6 @@ struct dma_chan;
 * bidirectional channel
 */
struct mmci_platform_data {
	unsigned int f_max;
	unsigned int ocr_mask;
	int (*ios_handler)(struct device *, struct mmc_ios *);
	unsigned int (*status)(struct device *);