Commit 8d6c742a authored Aug 26, 2013 by Tomasz Figa Committed by Kukjin Kim Sep 17, 2013

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>

parent 57a23126

arch/arm/mach-s3c64xx/dma.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -677,7 +677,7 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase,
		goto err_map;
		}

		clk_enable(dmac->clk);
		clk_prepare_enable(dmac->clk);

		dmac->regs = regs;
		dmac->chanbase = chbase;
		@@ -711,7 +711,7 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase,
		return 0;

		err_clk:
		clk_disable(dmac->clk);
		clk_disable_unprepare(dmac->clk);
		clk_put(dmac->clk);
		err_map:
		iounmap(regs);