aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrashant Gaikwad <pgaikwad@nvidia.com>2012-06-05 00:29:37 -0400
committerStephen Warren <swarren@nvidia.com>2012-06-11 13:55:36 -0400
commit1e674bc6689e9aca5bd4355d1f87093636ed1c02 (patch)
treebb6aaea02f6ecbeee31e887e61623cb422df7b62
parent6f786aad108ba5479d93410fb47e0f51a79f34b1 (diff)
mmc: tegra: add clk_prepare/clk_unprepare
Use clk_prepare/clk_unprepare as required by the generic clk framework. Cc: cjb@laptop.org Cc: linux-mmc@vger.kernel.org Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
-rw-r--r--drivers/mmc/host/sdhci-tegra.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index b38d8a78f6a0..278965695f00 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -334,7 +334,7 @@ static int __devinit sdhci_tegra_probe(struct platform_device *pdev)
334 rc = PTR_ERR(clk); 334 rc = PTR_ERR(clk);
335 goto err_clk_get; 335 goto err_clk_get;
336 } 336 }
337 clk_enable(clk); 337 clk_prepare_enable(clk);
338 pltfm_host->clk = clk; 338 pltfm_host->clk = clk;
339 339
340 host->mmc->pm_caps = plat->pm_flags; 340 host->mmc->pm_caps = plat->pm_flags;
@@ -349,7 +349,7 @@ static int __devinit sdhci_tegra_probe(struct platform_device *pdev)
349 return 0; 349 return 0;
350 350
351err_add_host: 351err_add_host:
352 clk_disable(pltfm_host->clk); 352 clk_disable_unprepare(pltfm_host->clk);
353 clk_put(pltfm_host->clk); 353 clk_put(pltfm_host->clk);
354err_clk_get: 354err_clk_get:
355 if (gpio_is_valid(plat->wp_gpio)) 355 if (gpio_is_valid(plat->wp_gpio))
@@ -390,7 +390,7 @@ static int __devexit sdhci_tegra_remove(struct platform_device *pdev)
390 if (gpio_is_valid(plat->power_gpio)) 390 if (gpio_is_valid(plat->power_gpio))
391 gpio_free(plat->power_gpio); 391 gpio_free(plat->power_gpio);
392 392
393 clk_disable(pltfm_host->clk); 393 clk_disable_unprepare(pltfm_host->clk);
394 clk_put(pltfm_host->clk); 394 clk_put(pltfm_host->clk);
395 395
396 sdhci_pltfm_free(pdev); 396 sdhci_pltfm_free(pdev);