Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 206494
b: refs/heads/master
c: fc09176
h: refs/heads/master
v: v3
  • Loading branch information
Takashi Iwai committed Aug 4, 2010
1 parent 5f5b1a6 commit 100dade
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 748cce431eb413e794c8f1d1974b78b47a6174ef
refs/heads/master: fc091769a5aa65c045bfbda149c424ba33d0abbb
29 changes: 29 additions & 0 deletions trunk/sound/pci/hda/patch_realtek.c
Original file line number Diff line number Diff line change
Expand Up @@ -6791,6 +6791,29 @@ static struct hda_amp_list alc260_loopbacks[] = {
};
#endif

/*
* Pin config fixes
*/
enum {
PINFIX_HP_DC5750,
};

static struct alc_pincfg alc260_hp_dc5750_pinfix[] = {
{ 0x11, 0x90130110 }, /* speaker */
{ }
};

static const struct alc_fixup alc260_fixups[] = {
[PINFIX_HP_DC5750] = {
.pins = alc260_hp_dc5750_pinfix
},
};

static struct snd_pci_quirk alc260_fixup_tbl[] = {
SND_PCI_QUIRK(0x103c, 0x280a, "HP dc5750", PINFIX_HP_DC5750),
{}
};

/*
* ALC260 configurations
*/
Expand Down Expand Up @@ -6990,6 +7013,9 @@ static int patch_alc260(struct hda_codec *codec)
board_config = ALC260_AUTO;
}

if (board_config == ALC260_AUTO)
alc_pick_fixup(codec, alc260_fixup_tbl, alc260_fixups, 1);

if (board_config == ALC260_AUTO) {
/* automatic parse from the BIOS config */
err = alc260_parse_auto_config(codec);
Expand Down Expand Up @@ -7035,6 +7061,9 @@ static int patch_alc260(struct hda_codec *codec)
set_capture_mixer(codec);
set_beep_amp(spec, 0x07, 0x05, HDA_INPUT);

if (board_config == ALC260_AUTO)
alc_pick_fixup(codec, alc260_fixup_tbl, alc260_fixups, 0);

spec->vmaster_nid = 0x08;

codec->patch_ops = alc_patch_ops;
Expand Down

0 comments on commit 100dade

Please sign in to comment.