Unverified Commit 74b7ee0e authored by Shengjiu Wang's avatar Shengjiu Wang Committed by Mark Brown
Browse files

ASoC: fsl_xcvr: Fix channel swap issue with ARC 



With pause and resume test for ARC, there is occasionally
channel swap issue. The reason is that currently driver set
the DPATH out of reset first, then start the DMA, the first
data got from FIFO may not be the Left channel.

Moving DPATH out of reset operation after the dma enablement
to fix this issue.

Fixes: 28564486 ("ASoC: fsl_xcvr: Add XCVR ASoC CPU DAI driver")
Signed-off-by: default avatarShengjiu Wang <shengjiu.wang@nxp.com>
Link: https://lore.kernel.org/r/1631265510-27384-1-git-send-email-shengjiu.wang@nxp.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3f4b57ad

sound/soc/fsl/fsl_xcvr.c

+12 −5
Original line number Diff line number Diff line
@@ -487,8 +487,9 @@ static int fsl_xcvr_prepare(struct snd_pcm_substream *substream, 
		return ret;

	}



	/* clear DPATH RESET */

	/* set DPATH RESET */

	m_ctl |= FSL_XCVR_EXT_CTRL_DPTH_RESET(tx);

	v_ctl |= FSL_XCVR_EXT_CTRL_DPTH_RESET(tx);

	ret = regmap_update_bits(xcvr->regmap, FSL_XCVR_EXT_CTRL, m_ctl, v_ctl);

	if (ret < 0) {

		dev_err(dai->dev, "Error while setting EXT_CTRL: %d\n", ret);
@@ -590,10 +591,6 @@ static void fsl_xcvr_shutdown(struct snd_pcm_substream *substream, 
		val  |= FSL_XCVR_EXT_CTRL_CMDC_RESET(tx);

	}



	/* set DPATH RESET */

	mask |= FSL_XCVR_EXT_CTRL_DPTH_RESET(tx);

	val  |= FSL_XCVR_EXT_CTRL_DPTH_RESET(tx);



	ret = regmap_update_bits(xcvr->regmap, FSL_XCVR_EXT_CTRL, mask, val);

	if (ret < 0) {

		dev_err(dai->dev, "Err setting DPATH RESET: %d\n", ret);
@@ -643,6 +640,16 @@ static int fsl_xcvr_trigger(struct snd_pcm_substream *substream, int cmd, 
			dev_err(dai->dev, "Failed to enable DMA: %d\n", ret);

			return ret;

		}



		/* clear DPATH RESET */

		ret = regmap_update_bits(xcvr->regmap, FSL_XCVR_EXT_CTRL,

					 FSL_XCVR_EXT_CTRL_DPTH_RESET(tx),

					 0);

		if (ret < 0) {

			dev_err(dai->dev, "Failed to clear DPATH RESET: %d\n", ret);

			return ret;

		}



		break;

	case SNDRV_PCM_TRIGGER_STOP:

	case SNDRV_PCM_TRIGGER_SUSPEND: