Commit bb372af0 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: davinci-mcasp: Move the AFIFO related code under start_tx/rx functions 



In this way the start code for tx/rx going to be located at the same place.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0380866a

sound/soc/davinci/davinci-mcasp.c

+16 −15
Original line number Diff line number Diff line
@@ -154,6 +154,13 @@ static bool mcasp_is_synchronous(struct davinci_mcasp *mcasp) 


static void mcasp_start_rx(struct davinci_mcasp *mcasp)

{

	if (mcasp->rxnumevt) {	/* enable FIFO */

		u32 reg = mcasp->fifo_base + MCASP_RFIFOCTL_OFFSET;



		mcasp_clr_bits(mcasp, reg, FIFO_ENABLE);

		mcasp_set_bits(mcasp, reg, FIFO_ENABLE);

	}



	/* Start clocks */

	mcasp_set_ctl_reg(mcasp, DAVINCI_MCASP_GBLCTLR_REG, RXHCLKRST);

	mcasp_set_ctl_reg(mcasp, DAVINCI_MCASP_GBLCTLR_REG, RXCLKRST);
@@ -181,6 +188,13 @@ static void mcasp_start_tx(struct davinci_mcasp *mcasp) 
{

	u32 cnt;



	if (mcasp->txnumevt) {	/* enable FIFO */

		u32 reg = mcasp->fifo_base + MCASP_WFIFOCTL_OFFSET;



		mcasp_clr_bits(mcasp, reg, FIFO_ENABLE);

		mcasp_set_bits(mcasp, reg, FIFO_ENABLE);

	}



	/* Start clocks */

	mcasp_set_ctl_reg(mcasp, DAVINCI_MCASP_GBLCTLX_REG, TXHCLKRST);

	mcasp_set_ctl_reg(mcasp, DAVINCI_MCASP_GBLCTLX_REG, TXCLKRST);
@@ -201,26 +215,13 @@ static void mcasp_start_tx(struct davinci_mcasp *mcasp) 


static void davinci_mcasp_start(struct davinci_mcasp *mcasp, int stream)

{

	u32 reg;



	mcasp->streams++;



	if (stream == SNDRV_PCM_STREAM_PLAYBACK) {

		if (mcasp->txnumevt) {	/* enable FIFO */

			reg = mcasp->fifo_base + MCASP_WFIFOCTL_OFFSET;

			mcasp_clr_bits(mcasp, reg, FIFO_ENABLE);

			mcasp_set_bits(mcasp, reg, FIFO_ENABLE);

		}

	if (stream == SNDRV_PCM_STREAM_PLAYBACK)

		mcasp_start_tx(mcasp);

	} else {

		if (mcasp->rxnumevt) {	/* enable FIFO */

			reg = mcasp->fifo_base + MCASP_RFIFOCTL_OFFSET;

			mcasp_clr_bits(mcasp, reg, FIFO_ENABLE);

			mcasp_set_bits(mcasp, reg, FIFO_ENABLE);

		}

	else

		mcasp_start_rx(mcasp);

}

}



static void mcasp_stop_rx(struct davinci_mcasp *mcasp)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE