diff options
| author |   Richard Zhao <richard.zhao@linaro.org> | 2012-01-13 11:09:56 +0800 |
|---|---|---|
| committer |   Vinod Koul <vinod.koul@linux.intel.com> | 2012-01-31 09:03:16 +0530 |
| commit | b9a591664a21a3d342b9e3b09b0aa2223ae7c469 (patch) | |
| tree | 2aa6cffe829676f188aba806c2662648a5968646 /drivers/dma | |
| parent | drivers/dma/amba-pl08x.c: adjust double test (diff) | |
| download | linux-dev-b9a591664a21a3d342b9e3b09b0aa2223ae7c469.tar.xz linux-dev-b9a591664a21a3d342b9e3b09b0aa2223ae7c469.zip | |
dma/imx-sdma: let sdma_run_channel call sdma_enable_channel
Let all enable channel code call sdma_enable_channel.
Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/imx-sdma.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index e58dbf638cc9..46e334d48e8d 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -394,6 +394,11 @@ static int sdma_config_ownership(struct sdma_channel *sdmac, return 0; } +static void sdma_enable_channel(struct sdma_engine *sdma, int channel) +{ + __raw_writel(1 << channel, sdma->regs + SDMA_H_START); +} + /* * sdma_run_channel - run a channel and wait till it's done */ @@ -405,7 +410,7 @@ static int sdma_run_channel(struct sdma_channel *sdmac) init_completion(&sdmac->done); - __raw_writel(1 << channel, sdma->regs + SDMA_H_START); + sdma_enable_channel(sdma, channel); ret = wait_for_completion_timeout(&sdmac->done, HZ); @@ -811,11 +816,6 @@ out: return ret; } -static void sdma_enable_channel(struct sdma_engine *sdma, int channel) -{ - __raw_writel(1 << channel, sdma->regs + SDMA_H_START); -} - static dma_cookie_t sdma_assign_cookie(struct sdma_channel *sdmac) { dma_cookie_t cookie = sdmac->chan.cookie; |