]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ASoC: cs53l30: Correct clock inversion check
authorNicolin Chen <nicoleotsuka@gmail.com>
Wed, 8 Jun 2016 23:10:05 +0000 (16:10 -0700)
committerMark Brown <broonie@kernel.org>
Mon, 13 Jun 2016 16:53:22 +0000 (17:53 +0100)
SND_SOC_DAIFMT_IB_NF = 0x3 (11b) | SND_SOC_DAIFMT_IB_IF = 0x4 (100b)
creates a mask 0x7 (111b) which also includes SND_SOC_DAIFMT_NB_IF
= 0x2 (10b).

So this patch uses the traditional way to check the clock inversion.

Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/cs53l30.c

index aa511e70099ec20b2c314a1c11c648abf0a51a57..384a3f79f1c5d6c9ab2693bb27f3cde2ca19723a 100644 (file)
@@ -599,8 +599,14 @@ static int cs53l30_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
        }
 
        /* Check to see if the SCLK is inverted */
-       if (fmt & (SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_IB_IF))
+       switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
+       case SND_SOC_DAIFMT_IB_NF:
+       case SND_SOC_DAIFMT_IB_IF:
                aspcfg ^= CS53L30_ASP_SCLK_INV;
+               break;
+       default:
+               break;
+       }
 
        regmap_update_bits(priv->regmap, CS53L30_ASPCFG_CTL,
                           CS53L30_ASP_MS | CS53L30_ASP_SCLK_INV, aspcfg);