Commit 8d6c742a authored by Tomasz Figa's avatar Tomasz Figa Committed by Kukjin Kim

ARM: S3C64XX: Use clk_prepare_enable/clk_disable_unprepare in dma.c

This patch modifies s3c64xx DMA driver to prepare and unprepare clocks
in addition to enableind and disabling, since it is required by common
clock framework.
Signed-off-by: default avatarTomasz Figa <tomasz.figa@gmail.com>
Tested-by: default avatarMark Brown <broonie@linaro.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 57a23126
...@@ -677,7 +677,7 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase, ...@@ -677,7 +677,7 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase,
goto err_map; goto err_map;
} }
clk_enable(dmac->clk); clk_prepare_enable(dmac->clk);
dmac->regs = regs; dmac->regs = regs;
dmac->chanbase = chbase; dmac->chanbase = chbase;
...@@ -711,7 +711,7 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase, ...@@ -711,7 +711,7 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase,
return 0; return 0;
err_clk: err_clk:
clk_disable(dmac->clk); clk_disable_unprepare(dmac->clk);
clk_put(dmac->clk); clk_put(dmac->clk);
err_map: err_map:
iounmap(regs); iounmap(regs);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment