aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-01-21 10:40:16 -0500
committerTakashi Iwai <tiwai@suse.de>2013-01-22 08:12:08 -0500
commitf2f8be43c5c92355feea2ec332375ece00bc0ff9 (patch)
tree3091ddbf8d78fe5cd6b81eba8f4c6dac4d3f92cd
parent2748746f40da674cd6ba405fd3ef83e12a94b8ed (diff)
ALSA: hda - Add aamix NID to AD codecs
The aamix NIDs are also missing for AD codecs. All AD codecs seem to have a (more or less) working aamix widget. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/patch_analog.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 162bc2f38450..a186b3da20b7 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -1187,6 +1187,7 @@ static int ad1986a_parse_auto_config(struct hda_codec *codec)
1187 /* AD1986A has the inverted EAPD implementation */ 1187 /* AD1986A has the inverted EAPD implementation */
1188 codec->inv_eapd = 1; 1188 codec->inv_eapd = 1;
1189 1189
1190 spec->gen.mixer_nid = 0x07;
1190 spec->beep_dev_nid = 0x19; 1191 spec->beep_dev_nid = 0x19;
1191 set_beep_amp(spec, 0x18, 0, HDA_OUTPUT); 1192 set_beep_amp(spec, 0x18, 0, HDA_OUTPUT);
1192 1193
@@ -1950,6 +1951,7 @@ static int ad1981_parse_auto_config(struct hda_codec *codec)
1950{ 1951{
1951 struct ad198x_spec *spec = codec->spec; 1952 struct ad198x_spec *spec = codec->spec;
1952 1953
1954 spec->gen.mixer_nid = 0x0e;
1953 spec->beep_dev_nid = 0x10; 1955 spec->beep_dev_nid = 0x10;
1954 set_beep_amp(spec, 0x0d, 0, HDA_OUTPUT); 1956 set_beep_amp(spec, 0x0d, 0, HDA_OUTPUT);
1955 return ad198x_parse_auto_config(codec); 1957 return ad198x_parse_auto_config(codec);
@@ -2825,6 +2827,7 @@ static int ad1988_parse_auto_config(struct hda_codec *codec)
2825{ 2827{
2826 struct ad198x_spec *spec = codec->spec; 2828 struct ad198x_spec *spec = codec->spec;
2827 2829
2830 spec->gen.mixer_nid = 0x20;
2828 spec->beep_dev_nid = 0x10; 2831 spec->beep_dev_nid = 0x10;
2829 set_beep_amp(spec, 0x10, 0, HDA_OUTPUT); 2832 set_beep_amp(spec, 0x10, 0, HDA_OUTPUT);
2830 return ad198x_parse_auto_config(codec); 2833 return ad198x_parse_auto_config(codec);
@@ -3172,6 +3175,7 @@ static int ad1884_parse_auto_config(struct hda_codec *codec)
3172{ 3175{
3173 struct ad198x_spec *spec = codec->spec; 3176 struct ad198x_spec *spec = codec->spec;
3174 3177
3178 spec->gen.mixer_nid = 0x20;
3175 spec->beep_dev_nid = 0x10; 3179 spec->beep_dev_nid = 0x10;
3176 set_beep_amp(spec, 0x10, 0, HDA_OUTPUT); 3180 set_beep_amp(spec, 0x10, 0, HDA_OUTPUT);
3177 return ad198x_parse_auto_config(codec); 3181 return ad198x_parse_auto_config(codec);
@@ -4632,6 +4636,7 @@ static int ad1882_parse_auto_config(struct hda_codec *codec)
4632{ 4636{
4633 struct ad198x_spec *spec = codec->spec; 4637 struct ad198x_spec *spec = codec->spec;
4634 4638
4639 spec->gen.mixer_nid = 0x20;
4635 spec->beep_dev_nid = 0x10; 4640 spec->beep_dev_nid = 0x10;
4636 set_beep_amp(spec, 0x10, 0, HDA_OUTPUT); 4641 set_beep_amp(spec, 0x10, 0, HDA_OUTPUT);
4637 return ad198x_parse_auto_config(codec); 4642 return ad198x_parse_auto_config(codec);