OSDN Git Service

mmc: pxamci: prepare and unprepare the clocks
authorRobert Jarzmik <robert.jarzmik@free.fr>
Tue, 2 Sep 2014 09:23:55 +0000 (11:23 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Tue, 9 Sep 2014 11:59:24 +0000 (13:59 +0200)
Add the clock prepare and unprepare call to the driver set_ios calls
phase. This will remove a warning once the PXA architecture is migrated
to the clock infrastructure.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/pxamci.c

index 0971a23..1b6d0bf 100644 (file)
@@ -474,7 +474,7 @@ static void pxamci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                unsigned int clk = rate / ios->clock;
 
                if (host->clkrt == CLKRT_OFF)
-                       clk_enable(host->clk);
+                       clk_prepare_enable(host->clk);
 
                if (ios->clock == 26000000) {
                        /* to support 26MHz */
@@ -501,7 +501,7 @@ static void pxamci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                pxamci_stop_clock(host);
                if (host->clkrt != CLKRT_OFF) {
                        host->clkrt = CLKRT_OFF;
-                       clk_disable(host->clk);
+                       clk_disable_unprepare(host->clk);
                }
        }