Merge audio function from 8901_P.

Root cause:
N/A

How to fix:
N/A

Change-Id: Id346f772c0aa28f5e252b02dfb81b20189410649
RiskArea:Audio
diff --git a/asoc/msm8952-slimbus.c b/asoc/msm8952-slimbus.c
old mode 100644
new mode 100755
index 4200c95..b26fee3
--- a/asoc/msm8952-slimbus.c
+++ b/asoc/msm8952-slimbus.c
@@ -189,7 +189,7 @@
 		return NULL;
 
 #define S(X, Y) ((WCD_MBHC_CAL_PLUG_TYPE_PTR(tasha_wcd_cal)->X) = (Y))
-	S(v_hs_max, 1500);
+	S(v_hs_max, 1600);
 #undef S
 #define S(X, Y) ((WCD_MBHC_CAL_BTN_DET_PTR(tasha_wcd_cal)->X) = (Y))
 	S(num_btn, WCD_MBHC_DEF_BUTTONS);
@@ -199,6 +199,17 @@
 	btn_high = ((void *)&btn_cfg->_v_btn_low) +
 		(sizeof(btn_cfg->_v_btn_low[0]) * btn_cfg->num_btn);
 
+//[FairPhone][jinjia]=2019.01.23=Adjust the voltage range threshold for headset multi-key detection. -s
+#if 1
+	btn_high[0] = 75;
+	btn_high[1] = 125;
+	btn_high[2] = 237;
+	btn_high[3] = 450;
+	btn_high[4] = 450;
+	btn_high[5] = 450;
+	btn_high[6] = 450;
+	btn_high[7] = 450;
+#else
 	btn_high[0] = 75;
 	btn_high[1] = 150;
 	btn_high[2] = 237;
@@ -207,6 +218,9 @@
 	btn_high[5] = 450;
 	btn_high[6] = 450;
 	btn_high[7] = 450;
+#endif
+//[FairPhone][jinjia]=2019.01.23=Adjust the voltage range threshold for headset multi-key detection. -e
+
 
 	return tasha_wcd_cal;
 }