ASoC: fsl_esai: fix register setting issue in RIGHT_J mode

commit cc29ea007347f39f4c5a4d27b0b555955a0277f9 upstream.

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

Fixes 43d24e76b698 ("ASoC: fsl_esai: Add ESAI CPU DAI driver")
Cc: <stable@vger.kernel.org>
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Ackedy-by: Nicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c
index e8adead8be00f5d9b5ef1313de2862773f49cc0d..a87836d4de15b4fe6126826464809196b86a1aa8 100644 (file)
--- a/sound/soc/fsl/fsl_esai.c
+++ b/sound/soc/fsl/fsl_esai.c
@@ -394,7 +394,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 */
@@ -451,12 +452,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);