ALSA: hda - restore the MIC FIXUP for some Dell machines
PATCH 1/1 ALSA: hda - restore the MIC FIXUP for some Dell machines
Those FIXUPs were applied to the machines through pin quirks, but recently the PCI_QUIRK makes them can't apply to the machines.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=99851
Signed-off-by Hui Wang <[email protected]>
--- sound/pci/hda/patch_realtek.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
sound/pci/hda/patch_realtek.c +17 -1
@@ -4522,6 +4522,8 @@ enum {ALC288_FIXUP_DELL_HEADSET_MODE ,ALC288_FIXUP_DELL1_MIC_NO_PRESENCE ,ALC288_FIXUP_DELL_XPS_13_GPIO6 , +ALC288_FIXUP_DELL_XPS_13 , +ALC288_FIXUP_DISABLE_AAMIX ,ALC292_FIXUP_DELL_E7X ,ALC292_FIXUP_DISABLE_AAMIX , ALC298_FIXUP_DELL1_MIC_NO_PRESENCE,
@@ -5053,9 +5055,23 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id =ALC288_FIXUP_DELL1_MIC_NO_PRESENCE }, + [ALC288_FIXUP_DISABLE_AAMIX] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc_fixup_disable_aamix, + .chained = true, + .chain_id =ALC288_FIXUP_DELL_XPS_13_GPIO6 + }, + [ALC288_FIXUP_DELL_XPS_13] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc_fixup_dell_xps13, + .chained = true, + .chain_id =ALC288_FIXUP_DISABLE_AAMIX + }, [ALC292_FIXUP_DISABLE_AAMIX] = { .type = HDA_FIXUP_FUNC, .v.func = alc_fixup_disable_aamix, + .chained = true, + .chain_id =ALC269_FIXUP_DELL2_MIC_NO_PRESENCE }, [ALC292_FIXUP_DELL_E7X] = { .type = HDA_FIXUP_FUNC,
@@ -5096,7 +5112,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x1028 ,0x0638 ,"Dell Inspiron 5439" ,ALC290_FIXUP_MONO_SPEAKERS_HSJACK ),SND_PCI_QUIRK (0x1028 ,0x064a ,"Dell" ,ALC293_FIXUP_DELL1_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x064b ,"Dell" ,ALC293_FIXUP_DELL1_MIC_NO_PRESENCE ), -SND_PCI_QUIRK (0x1028 ,0x0665 ,"Dell XPS 13" ,ALC292_FIXUP_DELL_E7X ), +SND_PCI_QUIRK (0x1028 ,0x0665 ,"Dell XPS 13" ,ALC288_FIXUP_DELL_XPS_13 ),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),
Signature · 1 line
1.9.1
Takashi Iwai
AppliedAt Fri, 26 Jun 2015 12:35:17 +0800,
Quoted 6 lines · Hui Wang
Those FIXUPs were applied to the machines through pin quirks, but recently the
PCI_QUIRKmakes them can't apply to the machines.Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=99851
Signed-off-by Hui Wang <[email protected]>
Thanks, applied.
Takashi
Quoted 53 lines
--- sound/pci/hda/patch_realtek.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)sound/pci/hda/patch_realtek.c +17
-1@@ -4522,6 +4522,8 @@ enum {ALC288_FIXUP_DELL_HEADSET_MODE ,ALC288_FIXUP_DELL1_MIC_NO_PRESENCE ,ALC288_FIXUP_DELL_XPS_13_GPIO6 , +ALC288_FIXUP_DELL_XPS_13 , +ALC288_FIXUP_DISABLE_AAMIX ,ALC292_FIXUP_DELL_E7X ,ALC292_FIXUP_DISABLE_AAMIX , ALC298_FIXUP_DELL1_MIC_NO_PRESENCE,@@ -5053,9 +5055,23 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id =ALC288_FIXUP_DELL1_MIC_NO_PRESENCE }, + [ALC288_FIXUP_DISABLE_AAMIX] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc_fixup_disable_aamix, + .chained = true, + .chain_id =ALC288_FIXUP_DELL_XPS_13_GPIO6 + }, + [ALC288_FIXUP_DELL_XPS_13] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc_fixup_dell_xps13, + .chained = true, + .chain_id =ALC288_FIXUP_DISABLE_AAMIX + }, [ALC292_FIXUP_DISABLE_AAMIX] = { .type = HDA_FIXUP_FUNC, .v.func = alc_fixup_disable_aamix, + .chained = true, + .chain_id =ALC269_FIXUP_DELL2_MIC_NO_PRESENCE }, [ALC292_FIXUP_DELL_E7X] = { .type = HDA_FIXUP_FUNC,@@ -5096,7 +5112,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x1028 ,0x0638 ,"Dell Inspiron 5439" ,ALC290_FIXUP_MONO_SPEAKERS_HSJACK ),SND_PCI_QUIRK (0x1028 ,0x064a ,"Dell" ,ALC293_FIXUP_DELL1_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x064b ,"Dell" ,ALC293_FIXUP_DELL1_MIC_NO_PRESENCE ), -SND_PCI_QUIRK (0x1028 ,0x0665 ,"Dell XPS 13" ,ALC292_FIXUP_DELL_E7X ), +SND_PCI_QUIRK (0x1028 ,0x0665 ,"Dell XPS 13" ,ALC288_FIXUP_DELL_XPS_13 ),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),Signature · 1 line
1.9.1