Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9a59166 authored by Richard Zhao's avatar Richard Zhao Committed by Vinod Koul
Browse files

dma/imx-sdma: let sdma_run_channel call sdma_enable_channel 



Let all enable channel code call sdma_enable_channel.

Signed-off-by: default avatarRichard Zhao <richard.zhao@linaro.org>
Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
parent 880db3ff

drivers/dma/imx-sdma.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -394,6 +394,11 @@ static int sdma_config_ownership(struct sdma_channel *sdmac, 
	return 0;

	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

 * 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);

	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);

	ret = wait_for_completion_timeout(&sdmac->done, HZ);
@@ -811,11 +816,6 @@ static int sdma_request_channel(struct sdma_channel *sdmac) 
	return ret;

	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)

static dma_cookie_t sdma_assign_cookie(struct sdma_channel *sdmac)

{

{

	dma_cookie_t cookie = sdmac->chan.cookie;

	dma_cookie_t cookie = sdmac->chan.cookie;