On Fri, Feb 15, 2019 at 11:04:38AM +0000, S.j. Wang wrote: > The ESAI_xCR_xWA is xCR's bit, not the xCCR's bit, driver set it to > wrong register, correct it. > > Signed-off-by: Shengjiu Wang <shengjiu.w...@nxp.com>
Would need this for stable kernel too. Ackedy-by: Nicolin Chen <nicoleots...@gmail.com> Thanks. > --- > sound/soc/fsl/fsl_esai.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c > index 57b484768a58..afe67c865330 100644 > --- a/sound/soc/fsl/fsl_esai.c > +++ b/sound/soc/fsl/fsl_esai.c > @@ -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); > > -- > 1.9.1 >
