openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: Update WM5100 accessory detection for revision A 

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown 2011-10-12 18:39:53 +01:00
parent 7c04241acb
commit 1cba77c163
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sound/soc/codecs/wm5100.c
View File

@ -2132,6 +2132,9 @@ static void wm5100_set_detect_mode(struct snd_soc_codec *codec, int the_mode)
WM5100_ACCDET_SRC,
(mode->bias << WM5100_ACCDET_BIAS_SRC_SHIFT) |
mode->micd_src << WM5100_ACCDET_SRC_SHIFT);
snd_soc_update_bits(codec, WM5100_MISC_CONTROL,
WM5100_HPCOM_SRC,
mode->micd_src << WM5100_HPCOM_SRC_SHIFT);
wm5100->jack_mode = the_mode;

7
sound/soc/codecs/wm5100.h
View File

@ -96,6 +96,7 @@ int wm5100_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack);
#define WM5100_MIC_DETECT_1 0x290
#define WM5100_MIC_DETECT_2 0x291
#define WM5100_MIC_DETECT_3 0x292
#define WM5100_MISC_CONTROL 0x2BB
#define WM5100_INPUT_ENABLES 0x301
#define WM5100_INPUT_ENABLES_STATUS 0x302
#define WM5100_IN1L_CONTROL 0x310
@ -1388,6 +1389,12 @@ int wm5100_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack);
#define WM5100_ACCDET_STS_SHIFT 0 /* ACCDET_STS */
#define WM5100_ACCDET_STS_WIDTH 1 /* ACCDET_STS */
/*
* R699 (0x2BB) - Misc Control
*/
#define WM5100_HPCOM_SRC 0x200 /* HPCOM_SRC */
#define WM5100_HPCOM_SRC_SHIFT 9 /* HPCOM_SRC */
/*
* R769 (0x301) - Input Enables
*/