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

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

Merge "ASoC: msm8952: Change keycode mapping and linein_th"

parents aace6318 bcbd1d59

sound/soc/msm/msm8952-slimbus.c

+9 −0
Original line number Diff line number Diff line
@@ -109,6 +109,15 @@ static struct wcd_mbhc_config wcd_mbhc_cfg = { 
	.mono_stero_detection = false,

	.swap_gnd_mic = NULL,

	.hs_ext_micbias = true,

	.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,

	.linein_th = 5000,

};



static struct wcd9xxx_mbhc_config wcd9xxx_mbhc_cfg = {

sound/soc/msm/msm8952.c

+9 −0
Original line number Diff line number Diff line
@@ -88,6 +88,15 @@ static struct wcd_mbhc_config mbhc_cfg = { 
	.mono_stero_detection = false,

	.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[4] = 0,

	.key_code[5] = 0,

	.key_code[6] = 0,

	.key_code[7] = 0,

	.linein_th = 5000,

};



static struct afe_clk_set mi2s_tx_clk = {