summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown2013-11-15 11:20:07 +0100
committerMark Brown2013-11-15 11:20:07 +0100
commit738867f9f86a55f85115cf0acf2915890052417b (patch)
tree68f5799bd47bc678f81967845f142fc53c1de082 /sound/soc
parentMerge remote-tracking branch 'asoc/fix/blackfin' into asoc-linus (diff)
parentASoC: cs42l52: Correct MIC CTL mask (diff)
downloadkernel-qcow2-linux-738867f9f86a55f85115cf0acf2915890052417b.tar.gz
kernel-qcow2-linux-738867f9f86a55f85115cf0acf2915890052417b.tar.xz
kernel-qcow2-linux-738867f9f86a55f85115cf0acf2915890052417b.zip
Merge remote-tracking branch 'asoc/fix/cs42l52' into asoc-linus
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/cs42l52.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/cs42l52.h b/sound/soc/codecs/cs42l52.h
index 4277012c4719..a935d7381af6 100644
--- a/sound/soc/codecs/cs42l52.h
+++ b/sound/soc/codecs/cs42l52.h
@@ -179,7 +179,7 @@
#define CS42L52_MICB_CTL 0x11
#define CS42L52_MIC_CTL_MIC_SEL_MASK 0xBF
#define CS42L52_MIC_CTL_MIC_SEL_SHIFT 6
-#define CS42L52_MIC_CTL_TYPE_MASK 0xDF
+#define CS42L52_MIC_CTL_TYPE_MASK 0x20
#define CS42L52_MIC_CTL_TYPE_SHIFT 5