From: Kuninori Morimoto <[email protected]>

This patch ensures that the clock has been stopped before
it calls tmio_mmc_set_clock().
The clock settings might be failed without this patch

Signed-off-by: Kuninori Morimoto <[email protected]>
---
v3 -> v4

 - based on latest git://git.linaro.org/people/ulf.hansson/mmc.git#next

 drivers/mmc/host/tmio_mmc_pio.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
index ba45413..7289331 100644
--- a/drivers/mmc/host/tmio_mmc_pio.c
+++ b/drivers/mmc/host/tmio_mmc_pio.c
@@ -924,12 +924,14 @@ static void tmio_mmc_set_ios(struct mmc_host *mmc, struct 
mmc_ios *ios)
                tmio_mmc_clk_stop(host);
                break;
        case MMC_POWER_UP:
+               tmio_mmc_clk_stop(host);
                tmio_mmc_set_clock(host, ios->clock);
                tmio_mmc_power_on(host, ios->vdd);
                tmio_mmc_clk_start(host);
                tmio_mmc_set_bus_width(host, ios->bus_width);
                break;
        case MMC_POWER_ON:
+               tmio_mmc_clk_stop(host);
                tmio_mmc_set_clock(host, ios->clock);
                tmio_mmc_clk_start(host);
                tmio_mmc_set_bus_width(host, ios->bus_width);
@@ -1199,6 +1201,7 @@ int tmio_mmc_host_runtime_resume(struct device *dev)
        tmio_mmc_clk_update(host);
 
        if (host->clk_cache) {
+               tmio_mmc_clk_stop(host);
                tmio_mmc_set_clock(host, host->clk_cache);
                tmio_mmc_clk_start(host);
        }
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to