diff options
author | Tomasz Figa <tomasz.figa@gmail.com> | 2013-08-25 13:00:37 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-09-16 17:47:35 -0400 |
commit | 8d6c742a6833dffde3ab2ab077480e97b130ccd4 (patch) | |
tree | aaae2df30e469471a5a2120b7f572aa5bb61b384 /arch/arm/mach-s3c64xx | |
parent | 57a2312632e072b5f055018988093d6bcb261411 (diff) |
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: Tomasz Figa <tomasz.figa@gmail.com>
Tested-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s3c64xx')
-rw-r--r-- | arch/arm/mach-s3c64xx/dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c64xx/dma.c b/arch/arm/mach-s3c64xx/dma.c index 759846c28d12..c511dfaae148 100644 --- a/arch/arm/mach-s3c64xx/dma.c +++ b/arch/arm/mach-s3c64xx/dma.c | |||
@@ -677,7 +677,7 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase, | |||
677 | goto err_map; | 677 | goto err_map; |
678 | } | 678 | } |
679 | 679 | ||
680 | clk_enable(dmac->clk); | 680 | clk_prepare_enable(dmac->clk); |
681 | 681 | ||
682 | dmac->regs = regs; | 682 | dmac->regs = regs; |
683 | dmac->chanbase = chbase; | 683 | dmac->chanbase = chbase; |
@@ -711,7 +711,7 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase, | |||
711 | return 0; | 711 | return 0; |
712 | 712 | ||
713 | err_clk: | 713 | err_clk: |
714 | clk_disable(dmac->clk); | 714 | clk_disable_unprepare(dmac->clk); |
715 | clk_put(dmac->clk); | 715 | clk_put(dmac->clk); |
716 | err_map: | 716 | err_map: |
717 | iounmap(regs); | 717 | iounmap(regs); |