These three HP machines all have the same pin config, so we can change it to a pin quirk.
Signed-off-by: David Henningsson <email address hidden> --- sound/pci/hda/patch_realtek.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index d16d8ec..22d9d21 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -4753,7 +4753,6 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x103c, 0x22cf, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), SND_PCI_QUIRK(0x103c, 0x22dc, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED), SND_PCI_QUIRK(0x103c, 0x22fb, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED), - SND_PCI_QUIRK(0x103c, 0x8004, "HP", ALC269_FIXUP_HP_GPIO4), /* ALC290 */ SND_PCI_QUIRK(0x103c, 0x221b, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED), SND_PCI_QUIRK(0x103c, 0x2221, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED), @@ -4767,7 +4766,6 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x103c, 0x2255, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED), SND_PCI_QUIRK(0x103c, 0x2256, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED), SND_PCI_QUIRK(0x103c, 0x2257, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED), - SND_PCI_QUIRK(0x103c, 0x2258, "HP", ALC269_FIXUP_HP_GPIO4), SND_PCI_QUIRK(0x103c, 0x2259, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED), SND_PCI_QUIRK(0x103c, 0x225a, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED), SND_PCI_QUIRK(0x103c, 0x2260, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), @@ -4776,7 +4774,6 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x103c, 0x2265, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), SND_PCI_QUIRK(0x103c, 0x2272, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED), SND_PCI_QUIRK(0x103c, 0x2273, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED), - SND_PCI_QUIRK(0x103c, 0x2277, "HP", ALC269_FIXUP_HP_GPIO4), SND_PCI_QUIRK(0x103c, 0x2278, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED), SND_PCI_QUIRK(0x103c, 0x227f, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), SND_PCI_QUIRK(0x103c, 0x2282, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), @@ -5009,6 +5006,19 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { {0x17, 0x40000000}, {0x1d, 0x40700001}, {0x21, 0x02211040}), + SND_HDA_PIN_QUIRK(0x10ec0280, 0x103c, "HP", ALC280_FIXUP_HP_GPIO4, + {0x12, 0x90a60130}, + {0x13, 0x40000000}, + {0x14, 0x90170110}, + {0x15, 0x0421101f}, + {0x16, 0x411111f0}, + {0x17, 0x411111f0}, + {0x18, 0x411111f0}, + {0x19, 0x411111f0}, + {0x1a, 0x04a11020}, + {0x1b, 0x411111f0}, + {0x1d, 0x40748605}, + {0x1e, 0x411111f0}), SND_HDA_PIN_QUIRK(0x10ec0280, 0x103c, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED, {0x12, 0x90a60140}, {0x13, 0x40000000}, -- 1.9.1
These three HP machines all have the same pin config, so we can
change it to a pin quirk.
Signed-off-by: David Henningsson <email address hidden> pci/hda/ patch_realtek. c | 16 +++++++++++++---
---
sound/
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/sound/ pci/hda/ patch_realtek. c b/sound/ pci/hda/ patch_realtek. c pci/hda/ patch_realtek. c pci/hda/ patch_realtek. c QUIRK(0x103c, 0x22cf, "HP", ALC269_ FIXUP_HP_ MUTE_LED_ MIC1), QUIRK(0x103c, 0x22dc, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED), QUIRK(0x103c, 0x22fb, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED), QUIRK(0x103c, 0x8004, "HP", ALC269_ FIXUP_HP_ GPIO4), QUIRK(0x103c, 0x221b, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED), QUIRK(0x103c, 0x2221, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED), QUIRK(0x103c, 0x2255, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED), QUIRK(0x103c, 0x2256, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED), QUIRK(0x103c, 0x2257, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED), QUIRK(0x103c, 0x2258, "HP", ALC269_ FIXUP_HP_ GPIO4), QUIRK(0x103c, 0x2259, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED), QUIRK(0x103c, 0x225a, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED), QUIRK(0x103c, 0x2260, "HP", ALC269_ FIXUP_HP_ MUTE_LED_ MIC1), QUIRK(0x103c, 0x2265, "HP", ALC269_ FIXUP_HP_ MUTE_LED_ MIC1), QUIRK(0x103c, 0x2272, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED), QUIRK(0x103c, 0x2273, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED), QUIRK(0x103c, 0x2277, "HP", ALC269_ FIXUP_HP_ GPIO4), QUIRK(0x103c, 0x2278, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED), QUIRK(0x103c, 0x227f, "HP", ALC269_ FIXUP_HP_ MUTE_LED_ MIC1), QUIRK(0x103c, 0x2282, "HP", ALC269_ FIXUP_HP_ MUTE_LED_ MIC1), pin_fixup_ tbl[] = { PIN_QUIRK( 0x10ec0280, 0x103c, "HP", ALC280_ FIXUP_HP_ GPIO4, PIN_QUIRK( 0x10ec0280, 0x103c, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED,
index d16d8ec..22d9d21 100644
--- a/sound/
+++ b/sound/
@@ -4753,7 +4753,6 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
SND_PCI_
SND_PCI_
SND_PCI_
- SND_PCI_
/* ALC290 */
SND_PCI_
SND_PCI_
@@ -4767,7 +4766,6 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
SND_PCI_
SND_PCI_
SND_PCI_
- SND_PCI_
SND_PCI_
SND_PCI_
SND_PCI_
@@ -4776,7 +4774,6 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
SND_PCI_
SND_PCI_
SND_PCI_
- SND_PCI_
SND_PCI_
SND_PCI_
SND_PCI_
@@ -5009,6 +5006,19 @@ static const struct snd_hda_pin_quirk alc269_
{0x17, 0x40000000},
{0x1d, 0x40700001},
{0x21, 0x02211040}),
+ SND_HDA_
+ {0x12, 0x90a60130},
+ {0x13, 0x40000000},
+ {0x14, 0x90170110},
+ {0x15, 0x0421101f},
+ {0x16, 0x411111f0},
+ {0x17, 0x411111f0},
+ {0x18, 0x411111f0},
+ {0x19, 0x411111f0},
+ {0x1a, 0x04a11020},
+ {0x1b, 0x411111f0},
+ {0x1d, 0x40748605},
+ {0x1e, 0x411111f0}),
SND_HDA_
{0x12, 0x90a60140},
{0x13, 0x40000000},
--
1.9.1