Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Revert "ALSA: hda - Fix pin-config of Gigabyte mobo"
This reverts commit c6b358748e19ce7e230b0926ac42696bc485a562.
It turned out that there are different pin configurations for this
PCI SSID, including multi-channel modes. And more proper fix for
allowing line-out mutes will come up in 2.6.40 tree, so we won't need
this fixup any more there.
Reported-by: Andrew Clayton <andrew@digital-domain.net>
Reported-by: Emmanuel Benisty <benisty.e@gmail.com>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
+3
-18
sound/pci/hda/patch_realtek.c
+3
-18
sound/pci/hda/patch_realtek.c
···
9864
SND_PCI_QUIRK(0x1071, 0x8258, "Evesham Voyaeger", ALC883_LAPTOP_EAPD),
9865
SND_PCI_QUIRK(0x10f1, 0x2350, "TYAN-S2350", ALC888_6ST_DELL),
9866
SND_PCI_QUIRK(0x108e, 0x534d, NULL, ALC883_3ST_6ch),
9867
9868
SND_PCI_QUIRK(0x1462, 0x0349, "MSI", ALC883_TARGA_2ch_DIG),
9869
SND_PCI_QUIRK(0x1462, 0x040d, "MSI", ALC883_TARGA_2ch_DIG),
···
10701
PINFIX_LENOVO_Y530,
10702
PINFIX_PB_M5210,
10703
PINFIX_ACER_ASPIRE_7736,
10704
-
PINFIX_GIGABYTE_880GM,
10705
};
10706
10707
static const struct alc_fixup alc882_fixups[] = {
···
10732
.type = ALC_FIXUP_SKU,
10733
.v.sku = ALC_FIXUP_SKU_IGNORE,
10734
},
10735
-
[PINFIX_GIGABYTE_880GM] = {
10736
-
.type = ALC_FIXUP_PINS,
10737
-
.v.pins = (const struct alc_pincfg[]) {
10738
-
{ 0x14, 0x1114410 }, /* set as speaker */
10739
-
{ }
10740
-
}
10741
-
},
10742
};
10743
10744
static struct snd_pci_quirk alc882_fixup_tbl[] = {
···
10739
SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Y530", PINFIX_LENOVO_Y530),
10740
SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", PINFIX_ABIT_AW9D_MAX),
10741
SND_PCI_QUIRK(0x1025, 0x0296, "Acer Aspire 7736z", PINFIX_ACER_ASPIRE_7736),
10742
-
SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte", PINFIX_GIGABYTE_880GM),
10743
{}
10744
};
10745
···
18798
ALC662_3ST_6ch_DIG),
18799
SND_PCI_QUIRK(0x1179, 0xff6e, "Toshiba NB20x", ALC662_AUTO),
18800
SND_PCI_QUIRK(0x144d, 0xca00, "Samsung NC10", ALC272_SAMSUNG_NC10),
18801
SND_PCI_QUIRK(0x152d, 0x2304, "Quanta WH1", ALC663_ASUS_H13),
18802
SND_PCI_QUIRK(0x1565, 0x820f, "Biostar TA780G M2+", ALC662_3ST_6ch_DIG),
18803
SND_PCI_QUIRK(0x1631, 0xc10c, "PB RS65", ALC663_ASUS_M51VA),
···
19473
ALC662_FIXUP_IDEAPAD,
19474
ALC272_FIXUP_MARIO,
19475
ALC662_FIXUP_CZC_P10T,
19476
-
ALC662_FIXUP_GIGABYTE,
19477
ALC662_FIXUP_SKU_IGNORE,
19478
};
19479
···
19502
{}
19503
}
19504
},
19505
-
[ALC662_FIXUP_GIGABYTE] = {
19506
-
.type = ALC_FIXUP_PINS,
19507
-
.v.pins = (const struct alc_pincfg[]) {
19508
-
{ 0x14, 0x1114410 }, /* set as speaker */
19509
-
{ }
19510
-
}
19511
-
},
19512
[ALC662_FIXUP_SKU_IGNORE] = {
19513
.type = ALC_FIXUP_SKU,
19514
.v.sku = ALC_FIXUP_SKU_IGNORE,
···
19513
SND_PCI_QUIRK(0x1025, 0x031c, "Gateway NV79", ALC662_FIXUP_SKU_IGNORE),
19514
SND_PCI_QUIRK(0x1025, 0x038b, "Acer Aspire 8943G", ALC662_FIXUP_ASPIRE),
19515
SND_PCI_QUIRK(0x144d, 0xc051, "Samsung R720", ALC662_FIXUP_IDEAPAD),
19516
-
SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte", ALC662_FIXUP_GIGABYTE),
19517
SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo Ideapad Y550P", ALC662_FIXUP_IDEAPAD),
19518
SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Ideapad Y550", ALC662_FIXUP_IDEAPAD),
19519
SND_PCI_QUIRK(0x1b35, 0x2206, "CZC P10T", ALC662_FIXUP_CZC_P10T),
···
9864
SND_PCI_QUIRK(0x1071, 0x8258, "Evesham Voyaeger", ALC883_LAPTOP_EAPD),
9865
SND_PCI_QUIRK(0x10f1, 0x2350, "TYAN-S2350", ALC888_6ST_DELL),
9866
SND_PCI_QUIRK(0x108e, 0x534d, NULL, ALC883_3ST_6ch),
9867
+
SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte P35 DS3R", ALC882_6ST_DIG),
9868
9869
SND_PCI_QUIRK(0x1462, 0x0349, "MSI", ALC883_TARGA_2ch_DIG),
9870
SND_PCI_QUIRK(0x1462, 0x040d, "MSI", ALC883_TARGA_2ch_DIG),
···
10700
PINFIX_LENOVO_Y530,
10701
PINFIX_PB_M5210,
10702
PINFIX_ACER_ASPIRE_7736,
10703
};
10704
10705
static const struct alc_fixup alc882_fixups[] = {
···
10732
.type = ALC_FIXUP_SKU,
10733
.v.sku = ALC_FIXUP_SKU_IGNORE,
10734
},
10735
};
10736
10737
static struct snd_pci_quirk alc882_fixup_tbl[] = {
···
10746
SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Y530", PINFIX_LENOVO_Y530),
10747
SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", PINFIX_ABIT_AW9D_MAX),
10748
SND_PCI_QUIRK(0x1025, 0x0296, "Acer Aspire 7736z", PINFIX_ACER_ASPIRE_7736),
10749
{}
10750
};
10751
···
18806
ALC662_3ST_6ch_DIG),
18807
SND_PCI_QUIRK(0x1179, 0xff6e, "Toshiba NB20x", ALC662_AUTO),
18808
SND_PCI_QUIRK(0x144d, 0xca00, "Samsung NC10", ALC272_SAMSUNG_NC10),
18809
+
SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte 945GCM-S2L",
18810
+
ALC662_3ST_6ch_DIG),
18811
SND_PCI_QUIRK(0x152d, 0x2304, "Quanta WH1", ALC663_ASUS_H13),
18812
SND_PCI_QUIRK(0x1565, 0x820f, "Biostar TA780G M2+", ALC662_3ST_6ch_DIG),
18813
SND_PCI_QUIRK(0x1631, 0xc10c, "PB RS65", ALC663_ASUS_M51VA),
···
19479
ALC662_FIXUP_IDEAPAD,
19480
ALC272_FIXUP_MARIO,
19481
ALC662_FIXUP_CZC_P10T,
19482
ALC662_FIXUP_SKU_IGNORE,
19483
};
19484
···
19509
{}
19510
}
19511
},
19512
[ALC662_FIXUP_SKU_IGNORE] = {
19513
.type = ALC_FIXUP_SKU,
19514
.v.sku = ALC_FIXUP_SKU_IGNORE,
···
19527
SND_PCI_QUIRK(0x1025, 0x031c, "Gateway NV79", ALC662_FIXUP_SKU_IGNORE),
19528
SND_PCI_QUIRK(0x1025, 0x038b, "Acer Aspire 8943G", ALC662_FIXUP_ASPIRE),
19529
SND_PCI_QUIRK(0x144d, 0xc051, "Samsung R720", ALC662_FIXUP_IDEAPAD),
19530
SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo Ideapad Y550P", ALC662_FIXUP_IDEAPAD),
19531
SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Ideapad Y550", ALC662_FIXUP_IDEAPAD),
19532
SND_PCI_QUIRK(0x1b35, 0x2206, "CZC P10T", ALC662_FIXUP_CZC_P10T),