mirror of
https://github.com/torvalds/linux.git
synced 2024-11-12 07:01:57 +00:00
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>
This commit is contained in:
parent
880db3ff17
commit
b9a591664a
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user