aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2016-11-28 23:12:14 +0000
committerAndroid Partner Code Review <android-gerrit-partner@google.com>2016-11-28 23:12:14 +0000
commitc0a6bb2266b0aded232573ac652d92ca40b8539f (patch)
tree9c97867995b164e179765ce9798004c0984a834e
parentc1610c6a6a51943265ff1c38b814ff4c04eaab12 (diff)
parentf98a9bb00c6b4cb188930f74221a81abc252a3ef (diff)
Merge "L9300:change threshold of mic voltage to match pull up resistor of PM8952 1,The pull up resistor pricision of PM8952 is bigger(25%) 2, Remove redundent voicecommand key value" into mnc-dr-dev-qcom-legoandroid-wear-7.0.0_r0.4
-rwxr-xr-xsound/soc/msm/msm8952.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/sound/soc/msm/msm8952.c b/sound/soc/msm/msm8952.c
index 7ac29322d7cf..9ef9336f7444 100755
--- a/sound/soc/msm/msm8952.c
+++ b/sound/soc/msm/msm8952.c
@@ -103,9 +103,9 @@ static struct wcd_mbhc_config mbhc_cfg = {
.swap_gnd_mic = NULL,
.hs_ext_micbias = false,
.key_code[0] = KEY_MEDIA,
- .key_code[1] = KEY_VOICECOMMAND,
- .key_code[2] = KEY_VOLUMEUP,
- .key_code[3] = KEY_VOLUMEDOWN,
+ .key_code[1] = KEY_VOLUMEUP,
+ .key_code[2] = KEY_VOLUMEDOWN,
+ .key_code[3] = 0,
.key_code[4] = 0,
.key_code[5] = 0,
.key_code[6] = 0,
@@ -1558,12 +1558,12 @@ static void *def_msm8952_wcd_mbhc_cal(void)
*/
btn_low[0] = 75;
btn_high[0] = 75;
- btn_low[1] = 80;
- btn_high[1] = 80;
- btn_low[2] = 200;
- btn_high[2] = 200;
- btn_low[3] = 350;
- btn_high[3] = 350;
+ btn_low[1] = 225;
+ btn_high[1] = 237;
+ btn_low[2] = 450;
+ btn_high[2] = 450;
+ btn_low[3] = 470;
+ btn_high[3] = 470;
btn_low[4] = 500;
btn_high[4] = 500;