diff options
| author | Prashant Gaikwad <pgaikwad@nvidia.com> | 2012-06-05 09:59:37 +0530 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2012-06-11 11:55:36 -0600 |
| commit | 1e674bc6689e9aca5bd4355d1f87093636ed1c02 (patch) | |
| tree | bb6aaea02f6ecbeee31e887e61623cb422df7b62 /drivers/mmc | |
| parent | 6f786aad108ba5479d93410fb47e0f51a79f34b1 (diff) | |
| download | op-kernel-dev-1e674bc6689e9aca5bd4355d1f87093636ed1c02.zip op-kernel-dev-1e674bc6689e9aca5bd4355d1f87093636ed1c02.tar.gz | |
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>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci-tegra.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index b38d8a7..2789656 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) rc = PTR_ERR(clk); goto err_clk_get; } - clk_enable(clk); + clk_prepare_enable(clk); pltfm_host->clk = clk; host->mmc->pm_caps = plat->pm_flags; @@ -349,7 +349,7 @@ static int __devinit sdhci_tegra_probe(struct platform_device *pdev) return 0; err_add_host: - clk_disable(pltfm_host->clk); + clk_disable_unprepare(pltfm_host->clk); clk_put(pltfm_host->clk); err_clk_get: if (gpio_is_valid(plat->wp_gpio)) @@ -390,7 +390,7 @@ static int __devexit sdhci_tegra_remove(struct platform_device *pdev) if (gpio_is_valid(plat->power_gpio)) gpio_free(plat->power_gpio); - clk_disable(pltfm_host->clk); + clk_disable_unprepare(pltfm_host->clk); clk_put(pltfm_host->clk); sdhci_pltfm_free(pdev); |
