Skip to content

Commit 5325b96

Browse files
Michael-zy2000broonie
authored andcommitted
ASoC: mediatek: mt8188-mt6359: Modify key
In order to get the correct keys when using the ES8326.We will associate SND_JACK_BTN_1 to KEY_VOLUMEUP and SND_JACK_BTN_2 to KEY_VOLUMEDOWN when the ES8326 flag is recognized. Signed-off-by: Zhang Yi <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent e0be875 commit 5325b96

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

sound/soc/mediatek/mt8188/mt8188-mt6359.c

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -734,6 +734,7 @@ static int mt8188_headset_codec_init(struct snd_soc_pcm_runtime *rtd)
734734
struct mtk_soc_card_data *soc_card_data = snd_soc_card_get_drvdata(rtd->card);
735735
struct snd_soc_jack *jack = &soc_card_data->card_data->jacks[MT8188_JACK_HEADSET];
736736
struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component;
737+
struct mtk_platform_card_data *card_data = soc_card_data->card_data;
737738
int ret;
738739

739740
ret = snd_soc_dapm_new_controls(&card->dapm, mt8188_nau8825_widgets,
@@ -762,10 +763,18 @@ static int mt8188_headset_codec_init(struct snd_soc_pcm_runtime *rtd)
762763
return ret;
763764
}
764765

765-
snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE);
766-
snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND);
767-
snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP);
768-
snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);
766+
if (card_data->flags & ES8326_HS_PRESENT) {
767+
snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE);
768+
snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOLUMEUP);
769+
snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN);
770+
snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOICECOMMAND);
771+
} else {
772+
snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE);
773+
snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND);
774+
snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP);
775+
snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);
776+
}
777+
769778
ret = snd_soc_component_set_jack(component, jack, NULL);
770779

771780
if (ret) {

0 commit comments

Comments
 (0)