Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebb47241 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Revert "ALSA: hda - Fix pin-config of Gigabyte mobo" 



This reverts commit c6b35874.

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: default avatarAndrew Clayton <andrew@digital-domain.net>
Reported-by: default avatarEmmanuel Benisty <benisty.e@gmail.com>
Cc: <stable@kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 94024cd1

sound/pci/hda/patch_realtek.c

+3 −18
Original line number Diff line number Diff line
@@ -9864,6 +9864,7 @@ static struct snd_pci_quirk alc882_cfg_tbl[] = { 
	SND_PCI_QUIRK(0x1071, 0x8258, "Evesham Voyaeger", ALC883_LAPTOP_EAPD),

	SND_PCI_QUIRK(0x10f1, 0x2350, "TYAN-S2350", ALC888_6ST_DELL),

	SND_PCI_QUIRK(0x108e, 0x534d, NULL, ALC883_3ST_6ch),

	SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte P35 DS3R", ALC882_6ST_DIG),















	SND_PCI_QUIRK(0x1462, 0x0349, "MSI", ALC883_TARGA_2ch_DIG),















	SND_PCI_QUIRK(0x1462, 0x040d, "MSI", ALC883_TARGA_2ch_DIG),










@@ -10700,7 +10701,6 @@ enum {













	PINFIX_LENOVO_Y530,















	PINFIX_PB_M5210,















	PINFIX_ACER_ASPIRE_7736,













	PINFIX_GIGABYTE_880GM,















};





























static const struct alc_fixup alc882_fixups[] = {










@@ -10732,13 +10732,6 @@ static const struct alc_fixup alc882_fixups[] = {













		.type = ALC_FIXUP_SKU,















		.v.sku = ALC_FIXUP_SKU_IGNORE,















	},













	[PINFIX_GIGABYTE_880GM] = {













		.type = ALC_FIXUP_PINS,













		.v.pins = (const struct alc_pincfg[]) {













			{ 0x14, 0x1114410 }, /* set as speaker */













			{ }













		}













	},















};





























static struct snd_pci_quirk alc882_fixup_tbl[] = {









@@ -10746,7 +10739,6 @@ static struct snd_pci_quirk alc882_fixup_tbl[] = {













	SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Y530", PINFIX_LENOVO_Y530),















	SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", PINFIX_ABIT_AW9D_MAX),















	SND_PCI_QUIRK(0x1025, 0x0296, "Acer Aspire 7736z", PINFIX_ACER_ASPIRE_7736),













	SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte", PINFIX_GIGABYTE_880GM),















	{}















};
























@@ -18806,6 +18798,8 @@ static struct snd_pci_quirk alc662_cfg_tbl[] = {













		      ALC662_3ST_6ch_DIG),















	SND_PCI_QUIRK(0x1179, 0xff6e, "Toshiba NB20x", ALC662_AUTO),















	SND_PCI_QUIRK(0x144d, 0xca00, "Samsung NC10", ALC272_SAMSUNG_NC10),













	SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte 945GCM-S2L",













		      ALC662_3ST_6ch_DIG),















	SND_PCI_QUIRK(0x152d, 0x2304, "Quanta WH1", ALC663_ASUS_H13),















	SND_PCI_QUIRK(0x1565, 0x820f, "Biostar TA780G M2+", ALC662_3ST_6ch_DIG),















	SND_PCI_QUIRK(0x1631, 0xc10c, "PB RS65", ALC663_ASUS_M51VA),










@@ -19479,7 +19473,6 @@ enum {













	ALC662_FIXUP_IDEAPAD,















	ALC272_FIXUP_MARIO,















	ALC662_FIXUP_CZC_P10T,













	ALC662_FIXUP_GIGABYTE,















	ALC662_FIXUP_SKU_IGNORE,















};
























@@ -19509,13 +19502,6 @@ static const struct alc_fixup alc662_fixups[] = {













			{}















		}















	},













	[ALC662_FIXUP_GIGABYTE] = {













		.type = ALC_FIXUP_PINS,













		.v.pins = (const struct alc_pincfg[]) {













			{ 0x14, 0x1114410 }, /* set as speaker */













			{ }













		}













	},















	[ALC662_FIXUP_SKU_IGNORE] = {















		.type = ALC_FIXUP_SKU,















		.v.sku = ALC_FIXUP_SKU_IGNORE,









@@ -19527,7 +19513,6 @@ static struct snd_pci_quirk alc662_fixup_tbl[] = {













	SND_PCI_QUIRK(0x1025, 0x031c, "Gateway NV79", ALC662_FIXUP_SKU_IGNORE),















	SND_PCI_QUIRK(0x1025, 0x038b, "Acer Aspire 8943G", ALC662_FIXUP_ASPIRE),















	SND_PCI_QUIRK(0x144d, 0xc051, "Samsung R720", ALC662_FIXUP_IDEAPAD),













	SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte", ALC662_FIXUP_GIGABYTE),















	SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo Ideapad Y550P", ALC662_FIXUP_IDEAPAD),















	SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Ideapad Y550", ALC662_FIXUP_IDEAPAD),















	SND_PCI_QUIRK(0x1b35, 0x2206, "CZC P10T", ALC662_FIXUP_CZC_P10T),