]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
mmc: jz4740: Use clk_prepare_enable/clk_disable_unprepare
authorLars-Peter Clausen <lars@metafoo.de>
Sun, 12 May 2013 18:12:38 +0000 (20:12 +0200)
committerChris Ball <cjb@laptop.org>
Thu, 27 Jun 2013 14:18:51 +0000 (10:18 -0400)
In preparation to switching the jz4740 clk driver to the
common clk framework, update the clk enable/disable calls
to clk_prepare_enable/clk_disable_unprepare.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
drivers/mmc/host/jz4740_mmc.c

index 1c47b3473ce35c1b7c95e7500a47ae590a4a35eb..c4f3872d06a799ded81782bc4b1e873733c1a560 100644 (file)
@@ -626,7 +626,7 @@ static void jz4740_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                        gpio_set_value(host->pdata->gpio_power,
                                        !host->pdata->power_active_low);
                host->cmdat |= JZ_MMC_CMDAT_INIT;
-               clk_enable(host->clk);
+               clk_prepare_enable(host->clk);
                break;
        case MMC_POWER_ON:
                break;
@@ -634,7 +634,7 @@ static void jz4740_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                if (gpio_is_valid(host->pdata->gpio_power))
                        gpio_set_value(host->pdata->gpio_power,
                                        host->pdata->power_active_low);
-               clk_disable(host->clk);
+               clk_disable_unprepare(host->clk);
                break;
        }