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

Commit cb6e2063 authored by Naresh Medisetty's avatar Naresh Medisetty Committed by Mark Brown
Browse files

ASoC: DaVinci: Fix audio stall when doing full duplex 



Fix concurrent capture/playback issue.
The issue is caused by re-initialization of control registers used specifically
for capture or playback in both capture and playback operations.

Signed-off-by: default avatarSteve Chen <schen@mvista.com>
Signed-off-by: default avatarNaresh Medisetty <naresh@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 8d702f23

sound/soc/davinci/davinci-i2s.c

+19 −12
Original line number Diff line number Diff line
@@ -295,10 +295,14 @@ static int davinci_i2s_hw_params(struct snd_pcm_substream *substream, 
	u32 w;



	/* general line settings */

	davinci_mcbsp_write_reg(dev, DAVINCI_MCBSP_SPCR_REG,

				DAVINCI_MCBSP_SPCR_RINTM(3) |

				DAVINCI_MCBSP_SPCR_XINTM(3) |

				DAVINCI_MCBSP_SPCR_FREE);

	w = davinci_mcbsp_read_reg(dev, DAVINCI_MCBSP_SPCR_REG);

	if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {

		w |= DAVINCI_MCBSP_SPCR_RINTM(3) | DAVINCI_MCBSP_SPCR_FREE;

		davinci_mcbsp_write_reg(dev, DAVINCI_MCBSP_SPCR_REG, w);

	} else {

		w |= DAVINCI_MCBSP_SPCR_XINTM(3) | DAVINCI_MCBSP_SPCR_FREE;

		davinci_mcbsp_write_reg(dev, DAVINCI_MCBSP_SPCR_REG, w);

	}



	i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_SAMPLE_BITS);

	w = davinci_mcbsp_read_reg(dev, DAVINCI_MCBSP_SRGR_REG);
@@ -329,16 +333,19 @@ static int davinci_i2s_hw_params(struct snd_pcm_substream *substream, 
		return -EINVAL;

	}



	if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {

		w = davinci_mcbsp_read_reg(dev, DAVINCI_MCBSP_RCR_REG);

		MOD_REG_BIT(w, DAVINCI_MCBSP_RCR_RWDLEN1(mcbsp_word_length) |

			       DAVINCI_MCBSP_RCR_RWDLEN2(mcbsp_word_length), 1);

		davinci_mcbsp_write_reg(dev, DAVINCI_MCBSP_RCR_REG, w);



	} else {

		w = davinci_mcbsp_read_reg(dev, DAVINCI_MCBSP_XCR_REG);

		MOD_REG_BIT(w, DAVINCI_MCBSP_XCR_XWDLEN1(mcbsp_word_length) |

			       DAVINCI_MCBSP_XCR_XWDLEN2(mcbsp_word_length), 1);

		davinci_mcbsp_write_reg(dev, DAVINCI_MCBSP_XCR_REG, w);



	}

	return 0;

}