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

Commit 373073ef authored by Russell King's avatar Russell King Committed by Chris Ball
Browse files

mmc: sdhci: move setting host->clock into sdhci_do_set_ios() 



We don't need implementations to do this, since the only time it's
necessary is when we change the clock, and the only place that happens
is in sdhci_do_set_ios().  So, move it there, and remove it from the
iMX platform backend.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Tested-by: default avatarMarkus Pargmann <mpa@pengutronix.de>
Tested-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarChris Ball <chris@printf.net>
parent 91138ca5

drivers/mmc/host/sdhci-cns3xxx.c

+1 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ static void sdhci_cns3xxx_set_clock(struct sdhci_host *host, unsigned int clock) 
	sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);



	if (clock == 0)

		goto out;

		return;



	while (host->max_clk / div > clock) {

		/*
@@ -72,8 +72,6 @@ static void sdhci_cns3xxx_set_clock(struct sdhci_host *host, unsigned int clock) 


	clk |= SDHCI_CLOCK_CARD_EN;

	sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL);

out:

	host->clock = clock;

}



static const struct sdhci_ops sdhci_cns3xxx_ops = {

drivers/mmc/host/sdhci-esdhc-imx.c

+1 −3
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ static inline void esdhc_pltfm_set_clock(struct sdhci_host *host, 
			writel(val & ~ESDHC_VENDOR_SPEC_FRC_SDCLK_ON,

					host->ioaddr + ESDHC_VENDOR_SPEC);

		}

		goto out;

		return;

	}



	if (esdhc_is_usdhc(imx_data) && !imx_data->is_ddr)
@@ -645,8 +645,6 @@ static inline void esdhc_pltfm_set_clock(struct sdhci_host *host, 
	}



	mdelay(1);

out:

	host->clock = clock;

}



static unsigned int esdhc_pltfm_get_ro(struct sdhci_host *host)

drivers/mmc/host/sdhci-of-esdhc.c

+1 −3
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static void esdhc_of_set_clock(struct sdhci_host *host, unsigned int clock) 
	u32 temp;



	if (clock == 0)

		goto out;

		return;



	/* Workaround to reduce the clock frequency for p1010 esdhc */

	if (of_find_compatible_node(NULL, NULL, "fsl,p1010-esdhc")) {
@@ -238,8 +238,6 @@ static void esdhc_of_set_clock(struct sdhci_host *host, unsigned int clock) 
		| (pre_div << ESDHC_PREDIV_SHIFT));

	sdhci_writel(host, temp, ESDHC_SYSTEM_CONTROL);

	mdelay(1);

out:

	host->clock = clock;

}



#ifdef CONFIG_PM

drivers/mmc/host/sdhci-s3c.c

+0 −3
Original line number Diff line number Diff line
@@ -295,7 +295,6 @@ static void sdhci_cmu_set_clock(struct sdhci_host *host, unsigned int clock) 
	/* If the clock is going off, set to 0 at clock control register */

	if (clock == 0) {

		sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);

		host->clock = clock;

		return;

	}
@@ -303,8 +302,6 @@ static void sdhci_cmu_set_clock(struct sdhci_host *host, unsigned int clock) 


	clk_set_rate(ourhost->clk_bus[ourhost->cur_clk], clock);



	host->clock = clock;



	clk = SDHCI_CLOCK_INT_EN;

	sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL);

drivers/mmc/host/sdhci.c

+4 −5
Original line number Diff line number Diff line
@@ -1130,7 +1130,7 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock) 
	sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);



	if (clock == 0)

		goto out;

		return;



	if (host->version >= SDHCI_SPEC_300) {

		if (sdhci_readw(host, SDHCI_HOST_CONTROL2) &
@@ -1220,9 +1220,6 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock) 


	clk |= SDHCI_CLOCK_CARD_EN;

	sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL);



out:

	host->clock = clock;

}



static int sdhci_set_power(struct sdhci_host *host, unsigned short power)
@@ -1441,8 +1438,10 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) 
		!(host->quirks2 & SDHCI_QUIRK2_PRESET_VALUE_BROKEN))

		sdhci_enable_preset_value(host, false);



	if (!ios->clock || ios->clock != host->clock)

	if (!ios->clock || ios->clock != host->clock) {

		sdhci_set_clock(host, ios->clock);

		host->clock = ios->clock;

	}



	if (ios->power_mode == MMC_POWER_OFF)

		vdd_bit = sdhci_set_power(host, -1);