summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/sdhci-cns3xxx.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-04-25 13:58:50 +0200
committerChris Ball <chris@printf.net>2014-05-22 13:26:31 +0200
commit1650d0c71a209c7d6bdddda8a7e187c537ceb71a (patch)
treeaca71fbf4f02d1b6eacb3f6ce07d837dc2ab33ec /drivers/mmc/host/sdhci-cns3xxx.c
parentmmc: sdhci: move setting host->clock into sdhci_do_set_ios() (diff)
downloadlinux-1650d0c71a209c7d6bdddda8a7e187c537ceb71a.tar.xz
linux-1650d0c71a209c7d6bdddda8a7e187c537ceb71a.zip
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: Russell King <rmk+kernel@arm.linux.org.uk> Tested-by: Markus Pargmann <mpa@pengutronix.de> Tested-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Chris Ball <chris@printf.net>
Diffstat (limited to 'drivers/mmc/host/sdhci-cns3xxx.c')
-rw-r--r--drivers/mmc/host/sdhci-cns3xxx.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-cns3xxx.c b/drivers/mmc/host/sdhci-cns3xxx.c
index f11fb908ad78..416f4a4c2e35 100644
--- a/drivers/mmc/host/sdhci-cns3xxx.c
+++ b/drivers/mmc/host/sdhci-cns3xxx.c
@@ -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)