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

Commit 1650d0c7 authored by Russell King's avatar Russell King Committed by Chris Ball
Browse files

mmc: sdhci: move setting mmc->actual_clock into set_clock handlers 



Move the setting of mmc->actual_clock to zero into the set_clock
handlers themselves.  This will allow us to clean up the calling
logic for the set_clock() method, and turn sdhci_set_clock() into
a library function.

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 373073ef

drivers/mmc/host/sdhci-cns3xxx.c

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ static void sdhci_cns3xxx_set_clock(struct sdhci_host *host, unsigned int clock) 
	u16 clk;

	unsigned long timeout;



	host->mmc->actual_clock = 0;



	sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);



	if (clock == 0)

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

+2 −0
Original line number Diff line number Diff line
@@ -600,6 +600,8 @@ static inline void esdhc_pltfm_set_clock(struct sdhci_host *host, 
	u32 temp, val;



	if (clock == 0) {

		host->mmc->actual_clock = 0;



		if (esdhc_is_usdhc(imx_data)) {

			val = readl(host->ioaddr + ESDHC_VENDOR_SPEC);

			writel(val & ~ESDHC_VENDOR_SPEC_FRC_SDCLK_ON,

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

+2 −1
Original line number Diff line number Diff line
@@ -199,11 +199,12 @@ static unsigned int esdhc_of_get_min_clock(struct sdhci_host *host) 


static void esdhc_of_set_clock(struct sdhci_host *host, unsigned int clock)

{



	int pre_div = 2;

	int div = 1;

	u32 temp;



	host->mmc->actual_clock = 0;



	if (clock == 0)

		return;

drivers/mmc/host/sdhci-s3c.c

+4 −0
Original line number Diff line number Diff line
@@ -158,6 +158,8 @@ static void sdhci_s3c_set_clock(struct sdhci_host *host, unsigned int clock) 
	int src;

	u32 ctrl;



	host->mmc->actual_clock = 0;



	/* don't bother if the clock is going off. */

	if (clock == 0)

		return;
@@ -292,6 +294,8 @@ static void sdhci_cmu_set_clock(struct sdhci_host *host, unsigned int clock) 
	unsigned long timeout;

	u16 clk = 0;



	host->mmc->actual_clock = 0;



	/* If the clock is going off, set to 0 at clock control register */

	if (clock == 0) {

		sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);

drivers/mmc/host/sdhci.c

+2 −2
Original line number Diff line number Diff line
@@ -1119,14 +1119,14 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock) 
	u16 clk = 0;

	unsigned long timeout;



	host->mmc->actual_clock = 0;



	if (host->ops->set_clock) {

		host->ops->set_clock(host, clock);

		if (host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK)

			return;

	}



	host->mmc->actual_clock = 0;



	sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);



	if (clock == 0)