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

Commit 98973f2f authored by Keith Packard's avatar Keith Packard Committed by Takashi Iwai
Browse files

ALSA: hda/realtek: Enable HP amp and mute LED on HP Folio 9480m [v3] 



This laptop needs GPIO4 pulled high to enable the headphone amplifier,
and has a mute LED on GPIO3. I modelled the patch on the existing
GPIO4 code which pulls the line low for the same purpose; this time,
the HP amp line is pulled high.

v2: Disable the headphone amplifier when no headphone is connected.
    Don't disable power savings to preserve the LED state.

v3: Remove headset-specific hooks and code; this is just a headphone.

Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 4d0e6775

sound/pci/hda/patch_realtek.c

+55 −0
Original line number Diff line number Diff line
@@ -4441,6 +4441,55 @@ static void alc290_fixup_mono_speakers(struct hda_codec *codec, 
	}

}



/* Hook to update amp GPIO4 for automute */

static void alc280_hp_gpio4_automute_hook(struct hda_codec *codec,

					  struct hda_jack_callback *jack)

{

	struct alc_spec *spec = codec->spec;



	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);

}



/* Manage GPIOs for HP EliteBook Folio 9480m.

 *

 * GPIO4 is the headphone amplifier power control

 * GPIO3 is the audio output mute indicator LED

 */



static void alc280_fixup_hp_9480m(struct hda_codec *codec,

				  const struct hda_fixup *fix,

				  int action)

{

	struct alc_spec *spec = codec->spec;

	static const struct hda_verb gpio_init[] = {

		{ 0x01, AC_VERB_SET_GPIO_MASK, 0x18 },

		{ 0x01, AC_VERB_SET_GPIO_DIRECTION, 0x18 },

		{}

	};



	if (action == HDA_FIXUP_ACT_PRE_PROBE) {

		/* Set the hooks to turn the headphone amp on/off

		 * as needed

		 */

		spec->gen.vmaster_mute.hook = alc_fixup_gpio_mute_hook;

		spec->gen.hp_automute_hook = alc280_hp_gpio4_automute_hook;



		/* The GPIOs are currently off */

		spec->gpio_led = 0;



		/* GPIO3 is connected to the output mute LED,

		 * high is on, low is off

		 */

		spec->mute_led_polarity = 0;

		spec->gpio_mute_led_mask = 0x08;



		/* Initialize GPIO configuration */

		snd_hda_add_verbs(codec, gpio_init);

	}

}



/* for hda_fixup_thinkpad_acpi() */

#include "thinkpad_helper.c"
@@ -4521,6 +4570,7 @@ enum { 
	ALC286_FIXUP_HP_GPIO_LED,

	ALC280_FIXUP_HP_GPIO2_MIC_HOTKEY,

	ALC280_FIXUP_HP_DOCK_PINS,

	ALC280_FIXUP_HP_9480M,

	ALC288_FIXUP_DELL_HEADSET_MODE,

	ALC288_FIXUP_DELL1_MIC_NO_PRESENCE,

	ALC288_FIXUP_DELL_XPS_13_GPIO6,
@@ -5043,6 +5093,10 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC280_FIXUP_HP_GPIO4

	},

	[ALC280_FIXUP_HP_9480M] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc280_fixup_hp_9480m,

	},

	[ALC288_FIXUP_DELL_HEADSET_MODE] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc_fixup_headset_mode_dell_alc288,
@@ -5161,6 +5215,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x22b7, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x22bf, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x22cf, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x22db, "HP", ALC280_FIXUP_HP_9480M),

	SND_PCI_QUIRK(0x103c, 0x22dc, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),

	SND_PCI_QUIRK(0x103c, 0x22fb, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),

	/* ALC290 */