summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrashant Gaikwad <pgaikwad@nvidia.com>2012-06-25 08:31:31 +0200
committerVinod Koul <vinod.koul@linux.intel.com>2012-06-27 15:33:25 +0200
commit56482ec0b156811eb463576a89a47f89e21f3587 (patch)
tree763c9639c75e0cf44ea32ccc7e9b096c2dc61253
parentdma: tegra: use sg_dma_address() for getting dma buffer address (diff)
downloadlinux-56482ec0b156811eb463576a89a47f89e21f3587.tar.xz
linux-56482ec0b156811eb463576a89a47f89e21f3587.zip
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>
-rw-r--r--drivers/dma/tegra20-apb-dma.c4
1 files changed, 2 insertions, 2 deletions
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;