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

Commit c04017ea authored by David Henningsson's avatar David Henningsson Committed by Takashi Iwai
Browse files

ALSA: hda - Fix headphone mic input on a few Dell ALC293 machines 

These laptops support both headphone, headset and mic modes
for the 3.5mm jack.

Cc: stable@vger.kernel.org
BugLink: https://bugs.launchpad.net/bugs/1526330


Signed-off-by: default avatarDavid Henningsson <david.henningsson@canonical.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 12a6116e

sound/pci/hda/patch_realtek.c

+12 −5
Original line number Diff line number Diff line
@@ -4606,6 +4606,7 @@ enum { 
	ALC288_FIXUP_DISABLE_AAMIX,

	ALC292_FIXUP_DELL_E7X,

	ALC292_FIXUP_DISABLE_AAMIX,

	ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK,

	ALC298_FIXUP_DELL1_MIC_NO_PRESENCE,

	ALC275_FIXUP_DELL_XPS,

	ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE,
@@ -5169,6 +5170,12 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC269_FIXUP_DELL2_MIC_NO_PRESENCE

	},

	[ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc_fixup_disable_aamix,

		.chained = true,

		.chain_id = ALC293_FIXUP_DELL1_MIC_NO_PRESENCE

	},

	[ALC292_FIXUP_DELL_E7X] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc_fixup_dell_xps13,
@@ -5247,11 +5254,11 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1028, 0x06c7, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x06d9, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x06da, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x06db, "Dell", ALC292_FIXUP_DISABLE_AAMIX),

	SND_PCI_QUIRK(0x1028, 0x06dd, "Dell", ALC292_FIXUP_DISABLE_AAMIX),

	SND_PCI_QUIRK(0x1028, 0x06de, "Dell", ALC292_FIXUP_DISABLE_AAMIX),

	SND_PCI_QUIRK(0x1028, 0x06df, "Dell", ALC292_FIXUP_DISABLE_AAMIX),

	SND_PCI_QUIRK(0x1028, 0x06e0, "Dell", ALC292_FIXUP_DISABLE_AAMIX),

	SND_PCI_QUIRK(0x1028, 0x06db, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK),

	SND_PCI_QUIRK(0x1028, 0x06dd, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK),

	SND_PCI_QUIRK(0x1028, 0x06de, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK),

	SND_PCI_QUIRK(0x1028, 0x06df, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK),

	SND_PCI_QUIRK(0x1028, 0x06e0, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK),

	SND_PCI_QUIRK(0x1028, 0x0704, "Dell XPS 13", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE),

	SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),