diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-01-18 12:25:45 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-01-18 12:27:29 -0500 |
commit | 164a7adac9b4fbd2a4838eff3597d27eb010c787 (patch) | |
tree | 42df821c5aa4cd31322a46701aff83b6e9c70d60 /sound/pci/hda/patch_conexant.c | |
parent | cf799aa300b38f86684944bf9f61f7a13277f8b2 (diff) |
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 'sound/pci/hda/patch_conexant.c')
-rw-r--r-- | sound/pci/hda/patch_conexant.c | 7 |
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 = { | |||
3197 | .init = snd_hda_gen_init, | 3197 | .init = snd_hda_gen_init, |
3198 | .free = snd_hda_gen_free, | 3198 | .free = snd_hda_gen_free, |
3199 | .unsol_event = snd_hda_jack_unsol_event, | 3199 | .unsol_event = snd_hda_jack_unsol_event, |
3200 | #ifdef CONFIG_PM | ||
3201 | .check_power_status = snd_hda_gen_check_power_status, | ||
3202 | #endif | ||
3200 | }; | 3203 | }; |
3201 | 3204 | ||
3202 | /* | 3205 | /* |
@@ -3348,6 +3351,10 @@ static int patch_conexant_auto(struct hda_codec *codec) | |||
3348 | case 0x14f15045: | 3351 | case 0x14f15045: |
3349 | codec->single_adc_amp = 1; | 3352 | codec->single_adc_amp = 1; |
3350 | break; | 3353 | break; |
3354 | case 0x14f15047: | ||
3355 | codec->pin_amp_workaround = 1; | ||
3356 | spec->gen.mixer_nid = 0x19; | ||
3357 | break; | ||
3351 | case 0x14f15051: | 3358 | case 0x14f15051: |
3352 | add_cx5051_fake_mutes(codec); | 3359 | add_cx5051_fake_mutes(codec); |
3353 | codec->pin_amp_workaround = 1; | 3360 | codec->pin_amp_workaround = 1; |