aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolin Chen <nicoleotsuka@gmail.com>2016-06-08 19:10:05 -0400
committerMark Brown <broonie@kernel.org>2016-06-13 12:53:22 -0400
commit88b1c01fb42e3d637c7e7f36cd4a30ce39a2add4 (patch)
tree5159ac56d3d9836c2a040f9203e39368f6fab5cd
parent53d4b031e3c31cc6160c2d0cdc326fb74280d239 (diff)
ASoC: cs53l30: Correct clock inversion check
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>
-rw-r--r--sound/soc/codecs/cs53l30.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/soc/codecs/cs53l30.c b/sound/soc/codecs/cs53l30.c
index aa511e70099e..384a3f79f1c5 100644
--- a/sound/soc/codecs/cs53l30.c
+++ b/sound/soc/codecs/cs53l30.c
@@ -599,8 +599,14 @@ static int cs53l30_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
599 } 599 }
600 600
601 /* Check to see if the SCLK is inverted */ 601 /* Check to see if the SCLK is inverted */
602 if (fmt & (SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_IB_IF)) 602 switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
603 case SND_SOC_DAIFMT_IB_NF:
604 case SND_SOC_DAIFMT_IB_IF:
603 aspcfg ^= CS53L30_ASP_SCLK_INV; 605 aspcfg ^= CS53L30_ASP_SCLK_INV;
606 break;
607 default:
608 break;
609 }
604 610
605 regmap_update_bits(priv->regmap, CS53L30_ASPCFG_CTL, 611 regmap_update_bits(priv->regmap, CS53L30_ASPCFG_CTL,
606 CS53L30_ASP_MS | CS53L30_ASP_SCLK_INV, aspcfg); 612 CS53L30_ASP_MS | CS53L30_ASP_SCLK_INV, aspcfg);