aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/wm5100.c3
-rw-r--r--sound/soc/codecs/wm5100.h7
2 files changed, 10 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index 02c011d7512e..5d88c99aaea6 100644
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -2132,6 +2132,9 @@ static void wm5100_set_detect_mode(struct snd_soc_codec *codec, int the_mode)
2132 WM5100_ACCDET_SRC, 2132 WM5100_ACCDET_SRC,
2133 (mode->bias << WM5100_ACCDET_BIAS_SRC_SHIFT) | 2133 (mode->bias << WM5100_ACCDET_BIAS_SRC_SHIFT) |
2134 mode->micd_src << WM5100_ACCDET_SRC_SHIFT); 2134 mode->micd_src << WM5100_ACCDET_SRC_SHIFT);
2135 snd_soc_update_bits(codec, WM5100_MISC_CONTROL,
2136 WM5100_HPCOM_SRC,
2137 mode->micd_src << WM5100_HPCOM_SRC_SHIFT);
2135 2138
2136 wm5100->jack_mode = the_mode; 2139 wm5100->jack_mode = the_mode;
2137 2140
diff --git a/sound/soc/codecs/wm5100.h b/sound/soc/codecs/wm5100.h
index fa32b1246373..970759636bdc 100644
--- a/sound/soc/codecs/wm5100.h
+++ b/sound/soc/codecs/wm5100.h
@@ -96,6 +96,7 @@ int wm5100_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack);
96#define WM5100_MIC_DETECT_1 0x290 96#define WM5100_MIC_DETECT_1 0x290
97#define WM5100_MIC_DETECT_2 0x291 97#define WM5100_MIC_DETECT_2 0x291
98#define WM5100_MIC_DETECT_3 0x292 98#define WM5100_MIC_DETECT_3 0x292
99#define WM5100_MISC_CONTROL 0x2BB
99#define WM5100_INPUT_ENABLES 0x301 100#define WM5100_INPUT_ENABLES 0x301
100#define WM5100_INPUT_ENABLES_STATUS 0x302 101#define WM5100_INPUT_ENABLES_STATUS 0x302
101#define WM5100_IN1L_CONTROL 0x310 102#define WM5100_IN1L_CONTROL 0x310
@@ -1389,6 +1390,12 @@ int wm5100_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack);
1389#define WM5100_ACCDET_STS_WIDTH 1 /* ACCDET_STS */ 1390#define WM5100_ACCDET_STS_WIDTH 1 /* ACCDET_STS */
1390 1391
1391/* 1392/*
1393 * R699 (0x2BB) - Misc Control
1394 */
1395#define WM5100_HPCOM_SRC 0x200 /* HPCOM_SRC */
1396#define WM5100_HPCOM_SRC_SHIFT 9 /* HPCOM_SRC */
1397
1398/*
1392 * R769 (0x301) - Input Enables 1399 * R769 (0x301) - Input Enables
1393 */ 1400 */
1394#define WM5100_IN4L_ENA 0x0080 /* IN4L_ENA */ 1401#define WM5100_IN4L_ENA 0x0080 /* IN4L_ENA */