diff options
author | Takashi Iwai <tiwai@suse.de> | 2016-04-26 08:04:19 (GMT) |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2016-04-26 08:12:46 (GMT) |
commit | a33d59599653edc6469c582f0ffd99c5fc58af04 (patch) | |
tree | 3edf0d94ce44dc12139d90ff850bbf222e82db5e /sound/pci/hda/patch_cirrus.c | |
parent | 58a8738cfcdec389b3764a636303f97b57f85193 (diff) | |
parent | bb03ed216370cb021f377f923471e56d1de3ff5d (diff) | |
download | linux-a33d59599653edc6469c582f0ffd99c5fc58af04.tar.xz |
Merge branch 'for-linus' into for-next
For taking back the recent change of HDA HDMI fixes for i915 HSW/BDW.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_cirrus.c')
-rw-r--r-- | sound/pci/hda/patch_cirrus.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index a47e8ae..80bbadc 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c @@ -361,6 +361,7 @@ static int cs_parse_auto_config(struct hda_codec *codec) { struct cs_spec *spec = codec->spec; int err; + int i; err = snd_hda_parse_pin_defcfg(codec, &spec->gen.autocfg, NULL, 0); if (err < 0) @@ -370,6 +371,19 @@ static int cs_parse_auto_config(struct hda_codec *codec) if (err < 0) return err; + /* keep the ADCs powered up when it's dynamically switchable */ + if (spec->gen.dyn_adc_switch) { + unsigned int done = 0; + for (i = 0; i < spec->gen.input_mux.num_items; i++) { + int idx = spec->gen.dyn_adc_idx[i]; + if (done & (1 << idx)) + continue; + snd_hda_gen_fix_pin_power(codec, + spec->gen.adc_nids[idx]); + done |= 1 << idx; + } + } + return 0; } |