Skip to content

Commit

Permalink
dmaengine: dw_dmac: Add clk_{un}prepare() support
Browse files Browse the repository at this point in the history
clk_{un}prepare is mandatory for platforms using common clock framework. Since
this driver is used by SPEAr platform, which supports common clock framework,
add clk_{un}prepare() support for it.

Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
  • Loading branch information
Viresh Kumar authored and Vinod Koul committed May 11, 2012
1 parent 56cbb3d commit 3075528
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/dma/dw_dmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -1429,7 +1429,7 @@ static int __init dw_probe(struct platform_device *pdev)
err = PTR_ERR(dw->clk);
goto err_clk;
}
clk_enable(dw->clk);
clk_prepare_enable(dw->clk);

/* force dma off, just in case */
dw_dma_off(dw);
Expand Down Expand Up @@ -1510,7 +1510,7 @@ static int __init dw_probe(struct platform_device *pdev)
return 0;

err_irq:
clk_disable(dw->clk);
clk_disable_unprepare(dw->clk);
clk_put(dw->clk);
err_clk:
iounmap(dw->regs);
Expand Down Expand Up @@ -1540,7 +1540,7 @@ static int __exit dw_remove(struct platform_device *pdev)
channel_clear_bit(dw, CH_EN, dwc->mask);
}

clk_disable(dw->clk);
clk_disable_unprepare(dw->clk);
clk_put(dw->clk);

iounmap(dw->regs);
Expand All @@ -1559,7 +1559,7 @@ static void dw_shutdown(struct platform_device *pdev)
struct dw_dma *dw = platform_get_drvdata(pdev);

dw_dma_off(platform_get_drvdata(pdev));
clk_disable(dw->clk);
clk_disable_unprepare(dw->clk);
}

static int dw_suspend_noirq(struct device *dev)
Expand All @@ -1568,7 +1568,7 @@ static int dw_suspend_noirq(struct device *dev)
struct dw_dma *dw = platform_get_drvdata(pdev);

dw_dma_off(platform_get_drvdata(pdev));
clk_disable(dw->clk);
clk_disable_unprepare(dw->clk);

return 0;
}
Expand All @@ -1578,7 +1578,7 @@ static int dw_resume_noirq(struct device *dev)
struct platform_device *pdev = to_platform_device(dev);
struct dw_dma *dw = platform_get_drvdata(pdev);

clk_enable(dw->clk);
clk_prepare_enable(dw->clk);
dma_writel(dw, CFG, DW_CFG_DMA_EN);
return 0;
}
Expand Down

0 comments on commit 3075528

Please sign in to comment.