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

Commit 322f74ed authored by Hui Wang's avatar Hui Wang Committed by Takashi Iwai
Browse files

ALSA: hda - Add MIC_NO_PRESENCE fixup for 2 HP machines 



There is a headset jack on the front panel, when we plug a headset
into it, the headset mic can't trigger unsol events, and
read_pin_sense() can't detect its presence too. So add this fixup
to fix this issue.

Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarHui Wang <hui.wang@canonical.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 1e9a328e

sound/pci/hda/patch_conexant.c

+29 −0
Original line number Diff line number Diff line
@@ -271,6 +271,8 @@ enum { 
	CXT_FIXUP_HP_SPECTRE,

	CXT_FIXUP_HP_GATE_MIC,

	CXT_FIXUP_MUTE_LED_GPIO,

	CXT_FIXUP_HEADSET_MIC,

	CXT_FIXUP_HP_MIC_NO_PRESENCE,

};



/* for hda_fixup_thinkpad_acpi() */
@@ -350,6 +352,18 @@ static void cxt_fixup_headphone_mic(struct hda_codec *codec, 
	}

}



static void cxt_fixup_headset_mic(struct hda_codec *codec,

				    const struct hda_fixup *fix, int action)

{

	struct conexant_spec *spec = codec->spec;



	switch (action) {

	case HDA_FIXUP_ACT_PRE_PROBE:

		spec->parse_flags |= HDA_PINCFG_HEADSET_MIC;

		break;

	}

}



/* OPLC XO 1.5 fixup */



/* OLPC XO-1.5 supports DC input mode (e.g. for use with analog sensors)
@@ -880,6 +894,19 @@ static const struct hda_fixup cxt_fixups[] = { 
		.type = HDA_FIXUP_FUNC,

		.v.func = cxt_fixup_mute_led_gpio,

	},

	[CXT_FIXUP_HEADSET_MIC] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = cxt_fixup_headset_mic,

	},

	[CXT_FIXUP_HP_MIC_NO_PRESENCE] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = (const struct hda_pintbl[]) {

			{ 0x1a, 0x02a1113c },

			{ }

		},

		.chained = true,

		.chain_id = CXT_FIXUP_HEADSET_MIC,

	},

};



static const struct snd_pci_quirk cxt5045_fixups[] = {
@@ -934,6 +961,8 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { 
	SND_PCI_QUIRK(0x103c, 0x8115, "HP Z1 Gen3", CXT_FIXUP_HP_GATE_MIC),

	SND_PCI_QUIRK(0x103c, 0x814f, "HP ZBook 15u G3", CXT_FIXUP_MUTE_LED_GPIO),

	SND_PCI_QUIRK(0x103c, 0x822e, "HP ProBook 440 G4", CXT_FIXUP_MUTE_LED_GPIO),

	SND_PCI_QUIRK(0x103c, 0x8299, "HP 800 G3 SFF", CXT_FIXUP_HP_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x103c, 0x829a, "HP 800 G3 DM", CXT_FIXUP_HP_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x138d, "Asus", CXT_FIXUP_HEADPHONE_MIC_PIN),

	SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT_FIXUP_OLPC_XO),

	SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400", CXT_PINCFG_LENOVO_TP410),