ASoC: tlv320aic31xx: Handle inverted BCLK in non-DSP modes

BugLink: https://bugs.launchpad.net/bugs/1853519
commit dcb407b257af06fa58b0544ec01ec9e0d3927e02 upstream

Currently BCLK inverting is only handled when the DAI format is
DSP, but the BCLK may be inverted in any supported mode. Without
this using this CODEC in any other mode than DSP with the BCLK
inverted leads to bad sampling timing and very poor audio quality.

Signed-off-by: Andrew F. Davis <afd@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c
index e2862372c26e1f6807c7f5d7035c1b9d2722ae45..cc95c15ceceb1a66622b9d7bb6d74abb43540da4 100644 (file)
--- a/sound/soc/codecs/tlv320aic31xx.c
+++ b/sound/soc/codecs/tlv320aic31xx.c
@@ -924,6 +924,18 @@ static int aic31xx_set_dai_fmt(struct snd_soc_dai *codec_dai,
                return -EINVAL;
        }
 
+       /* signal polarity */
+       switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
+       case SND_SOC_DAIFMT_NB_NF:
+               break;
+       case SND_SOC_DAIFMT_IB_NF:
+               iface_reg2 |= AIC31XX_BCLKINV_MASK;
+               break;
+       default:
+               dev_err(codec->dev, "Invalid DAI clock signal polarity\n");
+               return -EINVAL;
+       }
+
        /* interface format */
        switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
        case SND_SOC_DAIFMT_I2S:
@@ -931,16 +943,12 @@ static int aic31xx_set_dai_fmt(struct snd_soc_dai *codec_dai,
        case SND_SOC_DAIFMT_DSP_A:
                dsp_a_val = 0x1; /* fall through */
        case SND_SOC_DAIFMT_DSP_B:
-               /* NOTE: BCLKINV bit value 1 equas NB and 0 equals IB */
-               switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
-               case SND_SOC_DAIFMT_NB_NF:
-                       iface_reg2 |= AIC31XX_BCLKINV_MASK;
-                       break;
-               case SND_SOC_DAIFMT_IB_NF:
-                       break;
-               default:
-                       return -EINVAL;
-               }
+               /*
+                * NOTE: This CODEC samples on the falling edge of BCLK in
+                * DSP mode, this is inverted compared to what most DAIs
+                * expect, so we invert for this mode
+                */
+               iface_reg2 ^= AIC31XX_BCLKINV_MASK;
                iface_reg1 |= (AIC31XX_DSP_MODE <<
                               AIC31XX_IFACE1_DATATYPE_SHIFT);
                break;