aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-11-28 09:21:21 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-04 13:57:17 -0500
commit7f9bf8ad0ea7457c6f3d5c6b04fe6c7b99fec63d (patch)
tree1c37f3a9ff10fc533d48f4304468e78fe0cc0051 /sound/pci
parent41d7a448d028d328ce608b9207172a64ece4a005 (diff)
ALSA: hda - Initialize missing bass speaker pin for ASUS AIO ET2700
commit 1f0bbf03cb829162ec8e6d03c98aaaed88c6f534 upstream. Add a fixup entry for the missing bass speaker pin 0x16 on ASUS ET2700 AiO desktop. The channel map will be added in the next patch, so that this can be backported easily to stable kernels. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=65961 Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_realtek.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index fa8a1570e4dd..661afe7d85e4 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -1765,6 +1765,7 @@ enum {
1765 ALC889_FIXUP_IMAC91_VREF, 1765 ALC889_FIXUP_IMAC91_VREF,
1766 ALC882_FIXUP_INV_DMIC, 1766 ALC882_FIXUP_INV_DMIC,
1767 ALC882_FIXUP_NO_PRIMARY_HP, 1767 ALC882_FIXUP_NO_PRIMARY_HP,
1768 ALC887_FIXUP_ASUS_BASS,
1768}; 1769};
1769 1770
1770static void alc889_fixup_coef(struct hda_codec *codec, 1771static void alc889_fixup_coef(struct hda_codec *codec,
@@ -2086,6 +2087,13 @@ static const struct hda_fixup alc882_fixups[] = {
2086 .type = HDA_FIXUP_FUNC, 2087 .type = HDA_FIXUP_FUNC,
2087 .v.func = alc882_fixup_no_primary_hp, 2088 .v.func = alc882_fixup_no_primary_hp,
2088 }, 2089 },
2090 [ALC887_FIXUP_ASUS_BASS] = {
2091 .type = HDA_FIXUP_PINS,
2092 .v.pins = (const struct hda_pintbl[]) {
2093 {0x16, 0x99130130}, /* bass speaker */
2094 {}
2095 },
2096 },
2089}; 2097};
2090 2098
2091static const struct snd_pci_quirk alc882_fixup_tbl[] = { 2099static const struct snd_pci_quirk alc882_fixup_tbl[] = {
@@ -2119,6 +2127,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = {
2119 SND_PCI_QUIRK(0x1043, 0x1873, "ASUS W90V", ALC882_FIXUP_ASUS_W90V), 2127 SND_PCI_QUIRK(0x1043, 0x1873, "ASUS W90V", ALC882_FIXUP_ASUS_W90V),
2120 SND_PCI_QUIRK(0x1043, 0x1971, "Asus W2JC", ALC882_FIXUP_ASUS_W2JC), 2128 SND_PCI_QUIRK(0x1043, 0x1971, "Asus W2JC", ALC882_FIXUP_ASUS_W2JC),
2121 SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_FIXUP_EEE1601), 2129 SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_FIXUP_EEE1601),
2130 SND_PCI_QUIRK(0x1043, 0x84bc, "ASUS ET2700", ALC887_FIXUP_ASUS_BASS),
2122 SND_PCI_QUIRK(0x104d, 0x9047, "Sony Vaio TT", ALC889_FIXUP_VAIO_TT), 2131 SND_PCI_QUIRK(0x104d, 0x9047, "Sony Vaio TT", ALC889_FIXUP_VAIO_TT),
2123 SND_PCI_QUIRK(0x104d, 0x905a, "Sony Vaio Z", ALC882_FIXUP_NO_PRIMARY_HP), 2132 SND_PCI_QUIRK(0x104d, 0x905a, "Sony Vaio Z", ALC882_FIXUP_NO_PRIMARY_HP),
2124 SND_PCI_QUIRK(0x104d, 0x9043, "Sony Vaio VGC-LN51JGB", ALC882_FIXUP_NO_PRIMARY_HP), 2133 SND_PCI_QUIRK(0x104d, 0x9043, "Sony Vaio VGC-LN51JGB", ALC882_FIXUP_NO_PRIMARY_HP),