aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-11-22 02:06:36 -0500
committerTakashi Iwai <tiwai@suse.de>2013-11-22 02:10:03 -0500
commitd08c5ef2a039393eaf2ab2152db5f07790fa0f40 (patch)
tree5c569ccae7f85f0772558caed0e1c08f741dcc9b
parentee71a70e95e4a01be17cf4dfe0339f9774bb5927 (diff)
ALSA: hda - Provide missing pin configs for VAIO with ALC260
Some models (or maybe depending on BIOS version) of Sony VAIO with ALC260 give no proper pin configurations as default, resulting in the non-working speaker, etc. Just provide the whole pin configurations via a fixup. Reported-by: Matthew Markus <mmarkus@hearit.co> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/patch_realtek.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index bb653dd0f813..6d8d9b3520d0 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -1512,6 +1512,7 @@ enum {
1512 ALC260_FIXUP_KN1, 1512 ALC260_FIXUP_KN1,
1513 ALC260_FIXUP_FSC_S7020, 1513 ALC260_FIXUP_FSC_S7020,
1514 ALC260_FIXUP_FSC_S7020_JWSE, 1514 ALC260_FIXUP_FSC_S7020_JWSE,
1515 ALC260_FIXUP_VAIO_PINS,
1515}; 1516};
1516 1517
1517static void alc260_gpio1_automute(struct hda_codec *codec) 1518static void alc260_gpio1_automute(struct hda_codec *codec)
@@ -1652,6 +1653,24 @@ static const struct hda_fixup alc260_fixups[] = {
1652 .chained = true, 1653 .chained = true,
1653 .chain_id = ALC260_FIXUP_FSC_S7020, 1654 .chain_id = ALC260_FIXUP_FSC_S7020,
1654 }, 1655 },
1656 [ALC260_FIXUP_VAIO_PINS] = {
1657 .type = HDA_FIXUP_PINS,
1658 .v.pins = (const struct hda_pintbl[]) {
1659 /* Pin configs are missing completely on some VAIOs */
1660 { 0x0f, 0x01211020 },
1661 { 0x10, 0x0001003f },
1662 { 0x11, 0x411111f0 },
1663 { 0x12, 0x01a15930 },
1664 { 0x13, 0x411111f0 },
1665 { 0x14, 0x411111f0 },
1666 { 0x15, 0x411111f0 },
1667 { 0x16, 0x411111f0 },
1668 { 0x17, 0x411111f0 },
1669 { 0x18, 0x411111f0 },
1670 { 0x19, 0x411111f0 },
1671 { }
1672 }
1673 },
1655}; 1674};
1656 1675
1657static const struct snd_pci_quirk alc260_fixup_tbl[] = { 1676static const struct snd_pci_quirk alc260_fixup_tbl[] = {
@@ -1660,6 +1679,7 @@ static const struct snd_pci_quirk alc260_fixup_tbl[] = {
1660 SND_PCI_QUIRK(0x1025, 0x008f, "Acer", ALC260_FIXUP_GPIO1), 1679 SND_PCI_QUIRK(0x1025, 0x008f, "Acer", ALC260_FIXUP_GPIO1),
1661 SND_PCI_QUIRK(0x103c, 0x280a, "HP dc5750", ALC260_FIXUP_HP_DC5750), 1680 SND_PCI_QUIRK(0x103c, 0x280a, "HP dc5750", ALC260_FIXUP_HP_DC5750),
1662 SND_PCI_QUIRK(0x103c, 0x30ba, "HP Presario B1900", ALC260_FIXUP_HP_B1900), 1681 SND_PCI_QUIRK(0x103c, 0x30ba, "HP Presario B1900", ALC260_FIXUP_HP_B1900),
1682 SND_PCI_QUIRK(0x104d, 0x81bb, "Sony VAIO", ALC260_FIXUP_VAIO_PINS),
1663 SND_PCI_QUIRK(0x104d, 0x81e2, "Sony VAIO TX", ALC260_FIXUP_HP_PIN_0F), 1683 SND_PCI_QUIRK(0x104d, 0x81e2, "Sony VAIO TX", ALC260_FIXUP_HP_PIN_0F),
1664 SND_PCI_QUIRK(0x10cf, 0x1326, "FSC LifeBook S7020", ALC260_FIXUP_FSC_S7020), 1684 SND_PCI_QUIRK(0x10cf, 0x1326, "FSC LifeBook S7020", ALC260_FIXUP_FSC_S7020),
1665 SND_PCI_QUIRK(0x1509, 0x4540, "Favorit 100XS", ALC260_FIXUP_GPIO1), 1685 SND_PCI_QUIRK(0x1509, 0x4540, "Favorit 100XS", ALC260_FIXUP_GPIO1),