aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_realtek.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-01-15 12:45:53 -0500
committerTakashi Iwai <tiwai@suse.de>2013-01-15 12:45:53 -0500
commitea46c3c87c35b90139b4dca43917d0f605d568ed (patch)
tree00306a2e42aeda1b7820b24e03e367cee5dd07f1 /sound/pci/hda/patch_realtek.c
parentf038fcaca827a2330d502a5d653ab639419f45db (diff)
ALSA: hda - Add prefer_hp_amp flag to hda_gen_spec
Add a new flag to indicate whether HP amp is turned on as default for speaker or line-outs, and enable this for ALC260 codec, as many machines with this codec require the HP amp even for speakers. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_realtek.c')
-rw-r--r--sound/pci/hda/patch_realtek.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index fab31d29fa23..71a8894438ab 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -1506,8 +1506,6 @@ static void alc260_fixup_fsc_s7020(struct hda_codec *codec,
1506 1506
1507 if (action == HDA_FIXUP_ACT_PRE_PROBE) 1507 if (action == HDA_FIXUP_ACT_PRE_PROBE)
1508 spec->gen.add_out_jack_modes = 1; 1508 spec->gen.add_out_jack_modes = 1;
1509 else if (action == HDA_FIXUP_ACT_PROBE)
1510 snd_hda_set_pin_ctl_cache(codec, 0x10, PIN_HP);
1511} 1509}
1512 1510
1513static const struct hda_fixup alc260_fixups[] = { 1511static const struct hda_fixup alc260_fixups[] = {
@@ -1597,6 +1595,11 @@ static int patch_alc260(struct hda_codec *codec)
1597 return err; 1595 return err;
1598 1596
1599 spec = codec->spec; 1597 spec = codec->spec;
1598 /* as quite a few machines require HP amp for speaker outputs,
1599 * it's easier to enable it unconditionally; even if it's unneeded,
1600 * it's almost harmless.
1601 */
1602 spec->gen.prefer_hp_amp = 1;
1600 1603
1601 snd_hda_pick_fixup(codec, NULL, alc260_fixup_tbl, alc260_fixups); 1604 snd_hda_pick_fixup(codec, NULL, alc260_fixup_tbl, alc260_fixups);
1602 snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE); 1605 snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);