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

Unverified Commit cc29ea00 authored by S.j. Wang's avatar S.j. Wang Committed by Mark Brown
Browse files

ASoC: fsl_esai: fix register setting issue in RIGHT_J mode 



The ESAI_xCR_xWA is xCR's bit, not the xCCR's bit, driver set it to
wrong register, correct it.

Fixes 43d24e76 ("ASoC: fsl_esai: Add ESAI CPU DAI driver")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarShengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: default avatarFabio Estevam <festevam@gmail.com>
Ackedy-by: default avatarNicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d98afe13

sound/soc/fsl/fsl_esai.c

+4 −3
Original line number Diff line number Diff line
@@ -398,7 +398,8 @@ static int fsl_esai_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
		break;

	case SND_SOC_DAIFMT_RIGHT_J:

		/* Data on rising edge of bclk, frame high, right aligned */

		xccr |= ESAI_xCCR_xCKP | ESAI_xCCR_xHCKP | ESAI_xCR_xWA;

		xccr |= ESAI_xCCR_xCKP | ESAI_xCCR_xHCKP;

		xcr  |= ESAI_xCR_xWA;

		break;

	case SND_SOC_DAIFMT_DSP_A:

		/* Data on rising edge of bclk, frame high, 1clk before data */
@@ -455,12 +456,12 @@ static int fsl_esai_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
		return -EINVAL;

	}



	mask = ESAI_xCR_xFSL | ESAI_xCR_xFSR;

	mask = ESAI_xCR_xFSL | ESAI_xCR_xFSR | ESAI_xCR_xWA;

	regmap_update_bits(esai_priv->regmap, REG_ESAI_TCR, mask, xcr);

	regmap_update_bits(esai_priv->regmap, REG_ESAI_RCR, mask, xcr);



	mask = ESAI_xCCR_xCKP | ESAI_xCCR_xHCKP | ESAI_xCCR_xFSP |

		ESAI_xCCR_xFSD | ESAI_xCCR_xCKD | ESAI_xCR_xWA;

		ESAI_xCCR_xFSD | ESAI_xCCR_xCKD;

	regmap_update_bits(esai_priv->regmap, REG_ESAI_TCCR, mask, xccr);

	regmap_update_bits(esai_priv->regmap, REG_ESAI_RCCR, mask, xccr);