1 files changed, 33 insertions, 4 deletions

diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 1a36137e13ec..92b72d4f3984 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -174,6 +174,7 @@ static struct snd_kcontrol_new ad_beep_mixer[] = {
 static int ad198x_build_controls(struct hda_codec *codec)
 {
         struct ad198x_spec *spec = codec->spec;
+        struct snd_kcontrol *kctl;
         unsigned int i;
         int err;
 
@@ -208,9 +209,7 @@ static int ad198x_build_controls(struct hda_codec *codec)
                         if (!kctl)
                                 return -ENOMEM;
                         kctl->private_value = spec->beep_amp;
-                        err = snd_hda_ctl_add(codec,
-                                                get_amp_nid_(spec->beep_amp),
-                                                kctl);
+                        err = snd_hda_ctl_add(codec, 0, kctl);
                         if (err < 0)
                                 return err;
                 }
@@ -239,6 +238,28 @@ static int ad198x_build_controls(struct hda_codec *codec)
         }
 
         ad198x_free_kctls(codec); /* no longer needed */
+
+        /* assign Capture Source enums to NID */
+        kctl = snd_hda_find_mixer_ctl(codec, "Capture Source");
+        if (!kctl)
+                kctl = snd_hda_find_mixer_ctl(codec, "Input Source");
+        for (i = 0; kctl && i < kctl->count; i++) {
+                err = snd_hda_add_nids(codec, kctl, i, spec->capsrc_nids,
+                                       spec->input_mux->num_items);
+                if (err < 0)
+                        return err;
+        }
+
+        /* assign IEC958 enums to NID */
+        kctl = snd_hda_find_mixer_ctl(codec,
+                        SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source");
+        if (kctl) {
+                err = snd_hda_add_nid(codec, kctl, 0,
+                                      spec->multiout.dig_out_nid);
+                if (err < 0)
+                        return err;
+        }
+
         return 0;
 }
 
@@ -701,6 +722,7 @@ static struct snd_kcontrol_new ad1986a_laptop_eapd_mixers[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "External Amplifier",
+                .subdevice = HDA_SUBDEV_NID_FLAG | 0x1b,
                 .info = ad198x_eapd_info,
                 .get = ad198x_eapd_get,
                 .put = ad198x_eapd_put,
@@ -808,6 +830,7 @@ static struct snd_kcontrol_new ad1986a_automute_master_mixers[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
+                .subdevice = HDA_SUBDEV_AMP_FLAG,
                 .info = snd_hda_mixer_amp_switch_info,
                 .get = snd_hda_mixer_amp_switch_get,
                 .put = ad1986a_hp_master_sw_put,
@@ -1608,6 +1631,7 @@ static struct snd_kcontrol_new ad1981_hp_mixers[] = {
         HDA_BIND_VOL("Master Playback Volume", &ad1981_hp_bind_master_vol),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .subdevice = HDA_SUBDEV_NID_FLAG | 0x05,
                 .name = "Master Playback Switch",
                 .info = ad198x_eapd_info,
                 .get = ad198x_eapd_get,
@@ -2129,6 +2153,7 @@ static struct snd_kcontrol_new ad1988_laptop_mixers[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "External Amplifier",
+                .subdevice = HDA_SUBDEV_NID_FLAG | 0x12,
                 .info = ad198x_eapd_info,
                 .get = ad198x_eapd_get,
                 .put = ad198x_eapd_put,
@@ -2250,6 +2275,7 @@ static struct snd_kcontrol_new ad1988_spdif_out_mixers[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "IEC958 Playback Source",
+                .subdevice = HDA_SUBDEV_NID_FLAG | 0x1b,
                 .info = ad1988_spdif_playback_source_info,
                 .get = ad1988_spdif_playback_source_get,
                 .put = ad1988_spdif_playback_source_put,
@@ -2582,7 +2608,7 @@ static int add_control(struct ad198x_spec *spec, int type, const char *name,
         if (! knew->name)
                 return -ENOMEM;
         if (get_amp_nid_(val))
-                knew->subdevice = HDA_SUBDEV_NID_FLAG | get_amp_nid_(val);
+                knew->subdevice = HDA_SUBDEV_AMP_FLAG;
         knew->private_value = val;
         return 0;
 }
@@ -3736,6 +3762,7 @@ static struct snd_kcontrol_new ad1884a_laptop_mixers[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
+                .subdevice = HDA_SUBDEV_AMP_FLAG,
                 .info = snd_hda_mixer_amp_switch_info,
                 .get = snd_hda_mixer_amp_switch_get,
                 .put = ad1884a_mobile_master_sw_put,
@@ -3764,6 +3791,7 @@ static struct snd_kcontrol_new ad1884a_mobile_mixers[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
+                .subdevice = HDA_SUBDEV_AMP_FLAG,
                 .info = snd_hda_mixer_amp_switch_info,
                 .get = snd_hda_mixer_amp_switch_get,
                 .put = ad1884a_mobile_master_sw_put,
@@ -4105,6 +4133,7 @@ static struct snd_kcontrol_new ad1984a_touchsmart_mixers[] = {
 /*      HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT),*/
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .subdevice = HDA_SUBDEV_AMP_FLAG,
                 .name = "Master Playback Switch",
                 .info = snd_hda_mixer_amp_switch_info,
                 .get = snd_hda_mixer_amp_switch_get,