diff options
| author | Chaitanya Bandi <bandik@nvidia.com> | 2013-11-11 10:06:17 +0530 |
|---|---|---|
| committer | Laxman Dewangan <ldewangan@nvidia.com> | 2013-11-12 01:27:12 -0800 |
| commit | 3f2574841eecaad95f75123e1a5f1bb82212fed2 (patch) | |
| tree | 10cfd5253e89b7827aca1fb511d1d4b40bbce4b2 /drivers/dma | |
| parent | 9859e528704cc31d5ad4642454f6e6aac4b51cc1 (diff) | |
dma: tegra: Fix usage of clk_prepare
As clk_prepare shouldn't be called from
atomic context, moving it as appropriate.
Bug 1400884
Change-Id: Ica4ceee6db9275d37c53381504e30cafa048ccad
Signed-off-by: Chaitanya Bandi <bandik@nvidia.com>
Reviewed-on: http://git-master/r/328763
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/tegra20-apb-dma.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c index 23f8e02d478d..4bb44dbd5ffe 100644 --- a/drivers/dma/tegra20-apb-dma.c +++ b/drivers/dma/tegra20-apb-dma.c @@ -601,7 +601,7 @@ static void handle_once_dma_done(struct tegra_dma_channel *tdc, /* Do not start DMA if it is going to be terminate */ if (list_empty(&tdc->pending_sg_req) && (!to_terminate)) { - clk_disable_unprepare(tdc->tdma->dma_clk); + clk_disable(tdc->tdma->dma_clk); pm_runtime_put(tdc->tdma->dev); } @@ -717,7 +717,7 @@ static void tegra_dma_issue_pending(struct dma_chan *dc) } pm_runtime_get(tdc->tdma->dev); - ret = clk_prepare_enable(tdc->tdma->dma_clk); + ret = clk_enable(tdc->tdma->dma_clk); if (ret < 0) { dev_err(tdc2dev(tdc), "clk_enable failed: %d\n", ret); return; @@ -786,7 +786,7 @@ static void tegra_dma_terminate_all(struct dma_chan *dc) get_current_xferred_count(tdc, sgreq, wcount); } tegra_dma_resume(tdc); - clk_disable_unprepare(tdc->tdma->dma_clk); + clk_disable(tdc->tdma->dma_clk); pm_runtime_put(tdc->tdma->dev); skip_dma_stop: @@ -1210,6 +1210,7 @@ static int tegra_dma_alloc_chan_resources(struct dma_chan *dc) { struct tegra_dma_channel *tdc = to_tegra_dma_chan(dc); + clk_prepare(tdc->tdma->dma_clk); dma_cookie_init(&tdc->dma_chan); tdc->config_init = false; return 0; @@ -1231,7 +1232,7 @@ static void tegra_dma_free_chan_resources(struct dma_chan *dc) if (tdc->busy) tegra_dma_terminate_all(dc); - + clk_unprepare(tdc->tdma->dma_clk); spin_lock_irqsave(&tdc->lock, flags); list_splice_init(&tdc->pending_sg_req, &sg_req_list); list_splice_init(&tdc->free_sg_req, &sg_req_list); @@ -1534,24 +1535,11 @@ static int tegra_dma_remove(struct platform_device *pdev) 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_unprepare(tdma->dma_clk); return 0; } static int tegra_dma_runtime_resume(struct device *dev) { - struct platform_device *pdev = to_platform_device(dev); - struct tegra_dma *tdma = platform_get_drvdata(pdev); - int ret; - - ret = clk_prepare_enable(tdma->dma_clk); - if (ret < 0) { - dev_err(dev, "clk_enable failed: %d\n", ret); - return ret; - } return 0; } |