summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/cs53l30.c
diff options
context:
space:
mode:
authorNicolin Chen2016-06-09 01:10:05 +0200
committerMark Brown2016-06-13 18:53:22 +0200
commit88b1c01fb42e3d637c7e7f36cd4a30ce39a2add4 (patch)
tree5159ac56d3d9836c2a040f9203e39368f6fab5cd /sound/soc/codecs/cs53l30.c
parentASoC: cs53l30: include gpio/consumer.h (diff)
downloadkernel-qcow2-linux-88b1c01fb42e3d637c7e7f36cd4a30ce39a2add4.tar.gz
kernel-qcow2-linux-88b1c01fb42e3d637c7e7f36cd4a30ce39a2add4.tar.xz
kernel-qcow2-linux-88b1c01fb42e3d637c7e7f36cd4a30ce39a2add4.zip
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>
Diffstat (limited to 'sound/soc/codecs/cs53l30.c')
-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)
}
/* 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);