aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-11-22 02:06:36 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-11-29 14:11:47 -0500
commit5bc7e35d3470bf24c7640984bbfe20afd804afdb (patch)
treea90bc8f92711590e1963f16cea3b8473d6bed1c1 /sound
parent55b13703da85a79c38b3fe986f777838846d1623 (diff)
ALSA: hda - Provide missing pin configs for VAIO with ALC260
commit d08c5ef2a039393eaf2ab2152db5f07790fa0f40 upstream. 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> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
-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 1b354572ead1..8bce044583ed 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -1495,6 +1495,7 @@ enum {
1495 ALC260_FIXUP_KN1, 1495 ALC260_FIXUP_KN1,
1496 ALC260_FIXUP_FSC_S7020, 1496 ALC260_FIXUP_FSC_S7020,
1497 ALC260_FIXUP_FSC_S7020_JWSE, 1497 ALC260_FIXUP_FSC_S7020_JWSE,
1498 ALC260_FIXUP_VAIO_PINS,
1498}; 1499};
1499 1500
1500static void alc260_gpio1_automute(struct hda_codec *codec) 1501static void alc260_gpio1_automute(struct hda_codec *codec)
@@ -1635,6 +1636,24 @@ static const struct hda_fixup alc260_fixups[] = {
1635 .chained = true, 1636 .chained = true,
1636 .chain_id = ALC260_FIXUP_FSC_S7020, 1637 .chain_id = ALC260_FIXUP_FSC_S7020,
1637 }, 1638 },
1639 [ALC260_FIXUP_VAIO_PINS] = {
1640 .type = HDA_FIXUP_PINS,
1641 .v.pins = (const struct hda_pintbl[]) {
1642 /* Pin configs are missing completely on some VAIOs */
1643 { 0x0f, 0x01211020 },
1644 { 0x10, 0x0001003f },
1645 { 0x11, 0x411111f0 },
1646 { 0x12, 0x01a15930 },
1647 { 0x13, 0x411111f0 },
1648 { 0x14, 0x411111f0 },
1649 { 0x15, 0x411111f0 },
1650 { 0x16, 0x411111f0 },
1651 { 0x17, 0x411111f0 },
1652 { 0x18, 0x411111f0 },
1653 { 0x19, 0x411111f0 },
1654 { }
1655 }
1656 },
1638}; 1657};
1639 1658
1640static const struct snd_pci_quirk alc260_fixup_tbl[] = { 1659static const struct snd_pci_quirk alc260_fixup_tbl[] = {
@@ -1643,6 +1662,7 @@ static const struct snd_pci_quirk alc260_fixup_tbl[] = {
1643 SND_PCI_QUIRK(0x1025, 0x008f, "Acer", ALC260_FIXUP_GPIO1), 1662 SND_PCI_QUIRK(0x1025, 0x008f, "Acer", ALC260_FIXUP_GPIO1),
1644 SND_PCI_QUIRK(0x103c, 0x280a, "HP dc5750", ALC260_FIXUP_HP_DC5750), 1663 SND_PCI_QUIRK(0x103c, 0x280a, "HP dc5750", ALC260_FIXUP_HP_DC5750),
1645 SND_PCI_QUIRK(0x103c, 0x30ba, "HP Presario B1900", ALC260_FIXUP_HP_B1900), 1664 SND_PCI_QUIRK(0x103c, 0x30ba, "HP Presario B1900", ALC260_FIXUP_HP_B1900),
1665 SND_PCI_QUIRK(0x104d, 0x81bb, "Sony VAIO", ALC260_FIXUP_VAIO_PINS),
1646 SND_PCI_QUIRK(0x104d, 0x81e2, "Sony VAIO TX", ALC260_FIXUP_HP_PIN_0F), 1666 SND_PCI_QUIRK(0x104d, 0x81e2, "Sony VAIO TX", ALC260_FIXUP_HP_PIN_0F),
1647 SND_PCI_QUIRK(0x10cf, 0x1326, "FSC LifeBook S7020", ALC260_FIXUP_FSC_S7020), 1667 SND_PCI_QUIRK(0x10cf, 0x1326, "FSC LifeBook S7020", ALC260_FIXUP_FSC_S7020),
1648 SND_PCI_QUIRK(0x1509, 0x4540, "Favorit 100XS", ALC260_FIXUP_GPIO1), 1668 SND_PCI_QUIRK(0x1509, 0x4540, "Favorit 100XS", ALC260_FIXUP_GPIO1),