Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353213
b: refs/heads/master
c: 5397145
h: refs/heads/master
i:
  353211: 6894866
v: v3
  • Loading branch information
Takashi Iwai committed Jan 23, 2013
1 parent d8dd9a5 commit 1a4a15a
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f7c0bfa06009eed50210fdf993ff9cb886dc8224
refs/heads/master: 5397145f4faeabbb7937ac784f734b06b20ed921
13 changes: 12 additions & 1 deletion trunk/sound/pci/hda/patch_realtek.c
Original file line number Diff line number Diff line change
Expand Up @@ -1034,6 +1034,7 @@ enum {
ALC880_FIXUP_6ST_BASE,
ALC880_FIXUP_6ST,
ALC880_FIXUP_6ST_DIG,
ALC880_FIXUP_6ST_AUTOMUTE,
};

/* enable the volume-knob widget support on NID 0x21 */
Expand Down Expand Up @@ -1294,6 +1295,15 @@ static const struct hda_fixup alc880_fixups[] = {
.chained = true,
.chain_id = ALC880_FIXUP_6ST_BASE,
},
[ALC880_FIXUP_6ST_AUTOMUTE] = {
.type = HDA_FIXUP_PINS,
.v.pins = (const struct hda_pintbl[]) {
{ 0x1b, 0x0121401f }, /* HP with jack detect */
{ }
},
.chained_before = true,
.chain_id = ALC880_FIXUP_6ST_BASE,
},
};

static const struct snd_pci_quirk alc880_fixup_tbl[] = {
Expand All @@ -1308,7 +1318,7 @@ static const struct snd_pci_quirk alc880_fixup_tbl[] = {
SND_PCI_QUIRK(0x1584, 0x9077, "Uniwill P53", ALC880_FIXUP_VOL_KNOB),
SND_PCI_QUIRK(0x161f, 0x203d, "W810", ALC880_FIXUP_W810),
SND_PCI_QUIRK(0x161f, 0x205d, "Medion Rim 2150", ALC880_FIXUP_MEDION_RIM),
SND_PCI_QUIRK(0x1631, 0xe011, "PB 13201056", ALC880_FIXUP_6ST),
SND_PCI_QUIRK(0x1631, 0xe011, "PB 13201056", ALC880_FIXUP_6ST_AUTOMUTE),
SND_PCI_QUIRK(0x1734, 0x107c, "FSC F1734", ALC880_FIXUP_F1734),
SND_PCI_QUIRK(0x1734, 0x1094, "FSC Amilo M1451G", ALC880_FIXUP_FUJITSU),
SND_PCI_QUIRK(0x1734, 0x10ac, "FSC AMILO Xi 1526", ALC880_FIXUP_F1734),
Expand Down Expand Up @@ -1371,6 +1381,7 @@ static const struct hda_model_fixup alc880_fixup_models[] = {
{.id = ALC880_FIXUP_5ST_DIG, .name = "5stack-digout"},
{.id = ALC880_FIXUP_6ST, .name = "6stack"},
{.id = ALC880_FIXUP_6ST_DIG, .name = "6stack-digout"},
{.id = ALC880_FIXUP_6ST_AUTOMUTE, .name = "6stack-automute"},
{}
};

Expand Down

0 comments on commit 1a4a15a

Please sign in to comment.