aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_conexant.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-01-18 18:25:45 +0100
committerTakashi Iwai <tiwai@suse.de>2013-01-18 18:27:29 +0100
commit164a7adac9b4fbd2a4838eff3597d27eb010c787 (patch)
tree42df821c5aa4cd31322a46701aff83b6e9c70d60 /sound/pci/hda/patch_conexant.c
parentALSA: hda - Correct more array rooms in hda_gen_spec (diff)
downloadlinux-dev-164a7adac9b4fbd2a4838eff3597d27eb010c787.tar.xz
linux-dev-164a7adac9b4fbd2a4838eff3597d27eb010c787.zip
ALSA: hda/conexant - Set mixer NID 0x19 for CX20551 codec
Conexant CX20551 codec has a mixer in NID 0x19 and a few outputs have to take the input through this widget. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to '')
-rw-r--r--sound/pci/hda/patch_conexant.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 2f94acb16bde..2e6e2b08b5e9 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -3197,6 +3197,9 @@ static const struct hda_codec_ops cx_auto_patch_ops = {
.init = snd_hda_gen_init,
.free = snd_hda_gen_free,
.unsol_event = snd_hda_jack_unsol_event,
+#ifdef CONFIG_PM
+ .check_power_status = snd_hda_gen_check_power_status,
+#endif
};
/*
@@ -3348,6 +3351,10 @@ static int patch_conexant_auto(struct hda_codec *codec)
case 0x14f15045:
codec->single_adc_amp = 1;
break;
+ case 0x14f15047:
+ codec->pin_amp_workaround = 1;
+ spec->gen.mixer_nid = 0x19;
+ break;
case 0x14f15051:
add_cx5051_fake_mutes(codec);
codec->pin_amp_workaround = 1;