From: Prashant Gaikwad <pgaikwad@nvidia.com>
Date: Mon, 25 Jun 2012 06:31:31 +0000 (+0530)
Subject: dma: tegra: add clk_prepare/clk_unprepare
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=56482ec0b156811eb463576a89a47f89e21f3587;p=linux-beck.git

dma: tegra: add clk_prepare/clk_unprepare

Use clk_prepare/clk_unprepare as required by the generic clk framework.

Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
---

diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c
index 6d7d5d383cb1..78af256cca9e 100644
--- a/drivers/dma/tegra20-apb-dma.c
+++ b/drivers/dma/tegra20-apb-dma.c
@@ -1366,7 +1366,7 @@ static int tegra_dma_runtime_suspend(struct device *dev)
 	struct platform_device *pdev = to_platform_device(dev);
 	struct tegra_dma *tdma = platform_get_drvdata(pdev);
 
-	clk_disable(tdma->dma_clk);
+	clk_disable_unprepare(tdma->dma_clk);
 	return 0;
 }
 
@@ -1376,7 +1376,7 @@ static int tegra_dma_runtime_resume(struct device *dev)
 	struct tegra_dma *tdma = platform_get_drvdata(pdev);
 	int ret;
 
-	ret = clk_enable(tdma->dma_clk);
+	ret = clk_prepare_enable(tdma->dma_clk);
 	if (ret < 0) {
 		dev_err(dev, "clk_enable failed: %d\n", ret);
 		return ret;