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

Commit c33ee0a0 authored by Kai-Heng Feng's avatar Kai-Heng Feng Committed by Greg Kroah-Hartman
Browse files

ALSA: hda/realtek - Introduce polarity for micmute LED GPIO 



[ Upstream commit dbd13179780555ecd3c992dea1222ca31920e892 ]

Currently mute LED and micmute LED share the same GPIO polarity.

So split the polarity for mute and micmute, in case they have different
polarities.

Signed-off-by: default avatarKai-Heng Feng <kai.heng.feng@canonical.com>
Link: https://lore.kernel.org/r/20200430083255.5093-1-kai.heng.feng@canonical.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 84ef0da8

sound/pci/hda/patch_realtek.c

+8 −6
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ struct alc_spec { 


	/* mute LED for HP laptops, see alc269_fixup_mic_mute_hook() */

	int mute_led_polarity;

	int micmute_led_polarity;

	hda_nid_t mute_led_nid;

	hda_nid_t cap_mute_led_nid;
@@ -3862,11 +3863,9 @@ static void alc269_fixup_hp_mute_led_mic3(struct hda_codec *codec, 


/* update LED status via GPIO */

static void alc_update_gpio_led(struct hda_codec *codec, unsigned int mask,

				bool enabled)

				int polarity, bool enabled)

{

	struct alc_spec *spec = codec->spec;



	if (spec->mute_led_polarity)

	if (polarity)

		enabled = !enabled;

	alc_update_gpio_data(codec, mask, !enabled); /* muted -> LED on */

}
@@ -3877,7 +3876,8 @@ static void alc_fixup_gpio_mute_hook(void *private_data, int enabled) 
	struct hda_codec *codec = private_data;

	struct alc_spec *spec = codec->spec;



	alc_update_gpio_led(codec, spec->gpio_mute_led_mask, enabled);

	alc_update_gpio_led(codec, spec->gpio_mute_led_mask,

			    spec->mute_led_polarity, enabled);

}



/* turn on/off mic-mute LED via GPIO per capture hook */
@@ -3886,6 +3886,7 @@ static void alc_gpio_micmute_update(struct hda_codec *codec) 
	struct alc_spec *spec = codec->spec;



	alc_update_gpio_led(codec, spec->gpio_mic_led_mask,

			    spec->micmute_led_polarity,

			    spec->gen.micmute_led.led_value);

}
@@ -5476,7 +5477,8 @@ static void alc280_hp_gpio4_automute_hook(struct hda_codec *codec, 


	snd_hda_gen_hp_automute(codec, jack);

	/* mute_led_polarity is set to 0, so we pass inverted value here */

	alc_update_gpio_led(codec, 0x10, !spec->gen.hp_jack_present);

	alc_update_gpio_led(codec, 0x10, spec->mute_led_polarity,

			    !spec->gen.hp_jack_present);

}



/* Manage GPIOs for HP EliteBook Folio 9480m.