[PATCH v3 4/5] mmc: davinci: prepare clock
From: david@lechnology.com (David Lechner)
Date: 2016-03-17 03:46:42
Also in:
linux-mmc, lkml
Subsystem:
multimedia card (mmc), secure digital (sd) and sdio subsystem, the rest · Maintainers:
Ulf Hansson, Linus Torvalds
When trying to use this driver with the common clock framework, enabling the clock fails because it was not prepared. This fixes the problem by calling clk_prepare and clk_enable in a single function. Ditto for clk_disable_unprepare. Signed-off-by: David Lechner <david@lechnology.com> Acked-by: Sekhar Nori <redacted> --- v3 changes: none. drivers/mmc/host/davinci_mmc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
index e75407d..d5d931b 100644
--- a/drivers/mmc/host/davinci_mmc.c
+++ b/drivers/mmc/host/davinci_mmc.c@@ -1243,9 +1243,9 @@ static int __init davinci_mmcsd_probe(struct platform_device *pdev) ret = PTR_ERR(host->clk); goto clk_get_fail; } - ret = clk_enable(host->clk); + ret = clk_prepare_enable(host->clk); if (ret) - goto clk_enable_fail; + goto clk_prepare_enable_fail; host->mmc_input_clk = clk_get_rate(host->clk);
@@ -1351,8 +1351,8 @@ mmc_add_host_fail: cpu_freq_fail: davinci_release_dma_channels(host); dma_probe_defer: - clk_disable(host->clk); -clk_enable_fail: + clk_disable_unprepare(host->clk); +clk_prepare_enable_fail: clk_get_fail: ioremap_fail: mmc_free_host(mmc);
@@ -1367,7 +1367,7 @@ static int __exit davinci_mmcsd_remove(struct platform_device *pdev) mmc_remove_host(host->mmc); mmc_davinci_cpufreq_deregister(host); davinci_release_dma_channels(host); - clk_disable(host->clk); + clk_disable_unprepare(host->clk); mmc_free_host(host->mmc); return 0;
--
1.9.1