aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2013-05-12 14:12:38 -0400
committerChris Ball <cjb@laptop.org>2013-06-27 10:18:51 -0400
commitfca9661c6c8926171a49f6ac57adc65290f10caf (patch)
tree4ad475d9ee7738f7c604d55571d0f7450bf1dc7a /drivers/mmc
parentb9ec2744128d0940342b236e9018614ba8848118 (diff)
mmc: jz4740: Use clk_prepare_enable/clk_disable_unprepare
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>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/jz4740_mmc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c
index 1c47b3473ce3..c4f3872d06a7 100644
--- a/drivers/mmc/host/jz4740_mmc.c
+++ b/drivers/mmc/host/jz4740_mmc.c
@@ -626,7 +626,7 @@ static void jz4740_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
626 gpio_set_value(host->pdata->gpio_power, 626 gpio_set_value(host->pdata->gpio_power,
627 !host->pdata->power_active_low); 627 !host->pdata->power_active_low);
628 host->cmdat |= JZ_MMC_CMDAT_INIT; 628 host->cmdat |= JZ_MMC_CMDAT_INIT;
629 clk_enable(host->clk); 629 clk_prepare_enable(host->clk);
630 break; 630 break;
631 case MMC_POWER_ON: 631 case MMC_POWER_ON:
632 break; 632 break;
@@ -634,7 +634,7 @@ static void jz4740_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
634 if (gpio_is_valid(host->pdata->gpio_power)) 634 if (gpio_is_valid(host->pdata->gpio_power))
635 gpio_set_value(host->pdata->gpio_power, 635 gpio_set_value(host->pdata->gpio_power,
636 host->pdata->power_active_low); 636 host->pdata->power_active_low);
637 clk_disable(host->clk); 637 clk_disable_unprepare(host->clk);
638 break; 638 break;
639 } 639 }
640 640