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

Commit 34555c10 authored by Karl Beldan's avatar Karl Beldan Committed by Mark Brown
Browse files

ASoC: pxa2xx-i2s: Handle SACR1_DRPL and SACR1_DREC separately 



- hw_params enables both RPL and REC functions each time : Enable the
	appropriate function in pxa2xx_i2s_trigger.
- pxa2xx_i2s_shutdown disables i2s anytime one of RPL or REC function is
	off : Turn it off only when both functions are off.

Signed-off-by: default avatarKarl Beldan <karl.beldan@mobile-devices.fr>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent b243b77c

sound/soc/pxa/pxa2xx-i2s.c

+5 −3
Original line number Diff line number Diff line
@@ -176,9 +176,7 @@ static int pxa2xx_i2s_hw_params(struct snd_pcm_substream *substream, 


	/* is port used by another stream */

	if (!(SACR0 & SACR0_ENB)) {



		SACR0 = 0;

		SACR1 = 0;

		if (pxa_i2s.master)

			SACR0 |= SACR0_BCKD;
@@ -224,6 +222,10 @@ static int pxa2xx_i2s_trigger(struct snd_pcm_substream *substream, int cmd, 


	switch (cmd) {

	case SNDRV_PCM_TRIGGER_START:

		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)

			SACR1 &= ~SACR1_DRPL;

		else

			SACR1 &= ~SACR1_DREC;

		SACR0 |= SACR0_ENB;

		break;

	case SNDRV_PCM_TRIGGER_RESUME:
@@ -250,7 +252,7 @@ static void pxa2xx_i2s_shutdown(struct snd_pcm_substream *substream, 
		SAIMR &= ~SAIMR_RFS;

	}



	if (SACR1 & (SACR1_DREC | SACR1_DRPL)) {

	if ((SACR1 & (SACR1_DREC | SACR1_DRPL)) == (SACR1_DREC | SACR1_DRPL)) {

		SACR0 &= ~SACR0_ENB;

		pxa_i2s_wait();

		clk_disable(clk_i2s);