Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e6b6ab8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoc: wcd: mbhc: Change the key code mapping of buttons"

parents b3b8b610 1fe10441

sound/soc/msm/msm8996.c

+23 −15
Original line number Diff line number Diff line
@@ -197,6 +197,14 @@ static struct wcd9xxx_mbhc_config mbhc_cfg = { 
	.use_vddio_meas = true,

	.enable_anc_mic_detect = false,

	.hw_jack_type = SIX_POLE_JACK,

	.key_code[0] = KEY_MEDIA,

	.key_code[1] = KEY_VOICECOMMAND,

	.key_code[2] = KEY_VOLUMEUP,

	.key_code[3] = KEY_VOLUMEDOWN,

	.key_code[4] = 0,

	.key_code[5] = 0,

	.key_code[6] = 0,

	.key_code[7] = 0,

};



static inline int param_is_mask(int p)
@@ -1878,21 +1886,21 @@ static void *def_codec_mbhc_cal(void) 
	btn_high = wcd9xxx_mbhc_cal_btn_det_mp(btn_cfg,

					       MBHC_BTN_DET_V_BTN_HIGH);

	btn_low[0] = -50;

	btn_high[0] = 20;

	btn_low[1] = 21;

	btn_high[1] = 61;

	btn_low[2] = 62;

	btn_high[2] = 104;

	btn_low[3] = 105;

	btn_high[3] = 148;

	btn_low[4] = 149;

	btn_high[4] = 189;

	btn_low[5] = 190;

	btn_high[5] = 228;

	btn_low[6] = 229;

	btn_high[6] = 269;

	btn_low[7] = 270;

	btn_high[7] = 500;

	btn_high[0] = 90;

	btn_low[1] = 130;

	btn_high[1] = 220;

	btn_low[2] = 235;

	btn_high[2] = 335;

	btn_low[3] = 375;

	btn_high[3] = 655;

	btn_low[4] = 656;

	btn_high[4] = 660;

	btn_low[5] = 661;

	btn_high[5] = 670;

	btn_low[6] = 671;

	btn_high[6] = 680;

	btn_low[7] = 681;

	btn_high[7] = 690;

	n_ready = wcd9xxx_mbhc_cal_btn_det_mp(btn_cfg, MBHC_BTN_DET_N_READY);

	n_ready[0] = 80;

	n_ready[1] = 68;