aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRichard Zhao <richard.zhao@linaro.org>2011-11-15 01:48:09 -0500
committerSascha Hauer <s.hauer@pengutronix.de>2012-02-01 08:29:31 -0500
commit5ef97faa31ccf34d6fef0964aea3c924f9d534fe (patch)
tree8d12efe2503dd83073f043476bb8a5e591a14834 /drivers
parent83914337d117ac6537c2fff6c32e2c3a9810f7d4 (diff)
mmc: sdhci-esdhc-imx: add clk_prepare/clk_unprepare
It's for migrating to generic clk framework API. Signed-off-by: Richard Zhao <richard.zhao@linaro.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/sdhci-esdhc-imx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index d601e41af282..f4e82d45cafa 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -463,7 +463,7 @@ static int __devinit sdhci_esdhc_imx_probe(struct platform_device *pdev)
463 err = PTR_ERR(clk); 463 err = PTR_ERR(clk);
464 goto err_clk_get; 464 goto err_clk_get;
465 } 465 }
466 clk_enable(clk); 466 clk_prepare_enable(clk);
467 pltfm_host->clk = clk; 467 pltfm_host->clk = clk;
468 468
469 if (!is_imx25_esdhc(imx_data)) 469 if (!is_imx25_esdhc(imx_data))
@@ -558,7 +558,7 @@ no_card_detect_irq:
558 gpio_free(boarddata->wp_gpio); 558 gpio_free(boarddata->wp_gpio);
559no_card_detect_pin: 559no_card_detect_pin:
560no_board_data: 560no_board_data:
561 clk_disable(pltfm_host->clk); 561 clk_disable_unprepare(pltfm_host->clk);
562 clk_put(pltfm_host->clk); 562 clk_put(pltfm_host->clk);
563err_clk_get: 563err_clk_get:
564 kfree(imx_data); 564 kfree(imx_data);
@@ -585,7 +585,7 @@ static int __devexit sdhci_esdhc_imx_remove(struct platform_device *pdev)
585 gpio_free(boarddata->cd_gpio); 585 gpio_free(boarddata->cd_gpio);
586 } 586 }
587 587
588 clk_disable(pltfm_host->clk); 588 clk_disable_unprepare(pltfm_host->clk);
589 clk_put(pltfm_host->clk); 589 clk_put(pltfm_host->clk);
590 kfree(imx_data); 590 kfree(imx_data);
591 591