1 files changed, 120 insertions, 5 deletions

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index c7465053d6bb..aeb23ef6afe5 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -633,6 +633,7 @@ static int alc_pin_mode_put(struct snd_kcontrol *kcontrol,
 
 #define ALC_PIN_MODE(xname, nid, dir) \
         { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \
+          .subdevice = HDA_SUBDEV_NID_FLAG | nid, \
           .info = alc_pin_mode_info, \
           .get = alc_pin_mode_get, \
           .put = alc_pin_mode_put, \
@@ -684,6 +685,7 @@ static int alc_gpio_data_put(struct snd_kcontrol *kcontrol,
 }
 #define ALC_GPIO_DATA_SWITCH(xname, nid, mask) \
         { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \
+          .subdevice = HDA_SUBDEV_NID_FLAG | nid, \
           .info = alc_gpio_data_info, \
           .get = alc_gpio_data_get, \
           .put = alc_gpio_data_put, \
@@ -738,6 +740,7 @@ static int alc_spdif_ctrl_put(struct snd_kcontrol *kcontrol,
 }
 #define ALC_SPDIF_CTRL_SWITCH(xname, nid, mask) \
         { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \
+          .subdevice = HDA_SUBDEV_NID_FLAG | nid, \
           .info = alc_spdif_ctrl_info, \
           .get = alc_spdif_ctrl_get, \
           .put = alc_spdif_ctrl_put, \
@@ -791,6 +794,7 @@ static int alc_eapd_ctrl_put(struct snd_kcontrol *kcontrol,
 
 #define ALC_EAPD_CTRL_SWITCH(xname, nid, mask) \
         { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \
+          .subdevice = HDA_SUBDEV_NID_FLAG | nid, \
           .info = alc_eapd_ctrl_info, \
           .get = alc_eapd_ctrl_get, \
           .put = alc_eapd_ctrl_put, \
@@ -2443,6 +2447,15 @@ static const char *alc_slave_sws[] = {
  * build control elements
  */
 
+#define NID_MAPPING             (-1)
+
+#define SUBDEV_SPEAKER_         (0 << 6)
+#define SUBDEV_HP_              (1 << 6)
+#define SUBDEV_LINE_            (2 << 6)
+#define SUBDEV_SPEAKER(x)       (SUBDEV_SPEAKER_ | ((x) & 0x3f))
+#define SUBDEV_HP(x)            (SUBDEV_HP_ | ((x) & 0x3f))
+#define SUBDEV_LINE(x)          (SUBDEV_LINE_ | ((x) & 0x3f))
+
 static void alc_free_kctls(struct hda_codec *codec);
 
 #ifdef CONFIG_SND_HDA_INPUT_BEEP
@@ -2457,8 +2470,11 @@ static struct snd_kcontrol_new alc_beep_mixer[] = {
 static int alc_build_controls(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
-        int err;
-        int i;
+        struct snd_kcontrol *kctl;
+        struct snd_kcontrol_new *knew;
+        int i, j, err;
+        unsigned int u;
+        hda_nid_t nid;
 
         for (i = 0; i < spec->num_mixers; i++) {
                 err = snd_hda_add_new_ctls(codec, spec->mixers[i]);
@@ -2499,8 +2515,7 @@ static int alc_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;
                 }
@@ -2527,6 +2542,73 @@ static int alc_build_controls(struct hda_codec *codec)
         }
 
         alc_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;
+        }
+        if (spec->cap_mixer) {
+                const char *kname = kctl ? kctl->id.name : NULL;
+                for (knew = spec->cap_mixer; knew->name; knew++) {
+                        if (kname && strcmp(knew->name, kname) == 0)
+                                continue;
+                        kctl = snd_hda_find_mixer_ctl(codec, knew->name);
+                        for (i = 0; kctl && i < kctl->count; i++) {
+                                err = snd_hda_add_nid(codec, kctl, i,
+                                                      spec->adc_nids[i]);
+                                if (err < 0)
+                                        return err;
+                        }
+                }
+        }
+
+        /* other nid->control mapping */
+        for (i = 0; i < spec->num_mixers; i++) {
+                for (knew = spec->mixers[i]; knew->name; knew++) {
+                        if (knew->iface != NID_MAPPING)
+                                continue;
+                        kctl = snd_hda_find_mixer_ctl(codec, knew->name);
+                        if (kctl == NULL)
+                                continue;
+                        u = knew->subdevice;
+                        for (j = 0; j < 4; j++, u >>= 8) {
+                                nid = u & 0x3f;
+                                if (nid == 0)
+                                        continue;
+                                switch (u & 0xc0) {
+                                case SUBDEV_SPEAKER_:
+                                        nid = spec->autocfg.speaker_pins[nid];
+                                        break;
+                                case SUBDEV_LINE_:
+                                        nid = spec->autocfg.line_out_pins[nid];
+                                        break;
+                                case SUBDEV_HP_:
+                                        nid = spec->autocfg.hp_pins[nid];
+                                        break;
+                                default:
+                                        continue;
+                                }
+                                err = snd_hda_add_nid(codec, kctl, 0, nid);
+                                if (err < 0)
+                                        return err;
+                        }
+                        u = knew->private_value;
+                        for (j = 0; j < 4; j++, u >>= 8) {
+                                nid = u & 0xff;
+                                if (nid == 0)
+                                        continue;
+                                err = snd_hda_add_nid(codec, kctl, 0, nid);
+                                if (err < 0)
+                                        return err;
+                        }
+                }
+        }
         return 0;
 }
 
@@ -3832,6 +3914,7 @@ static int alc_test_pin_src_put(struct snd_kcontrol *kcontrol,
 #define PIN_CTL_TEST(xname,nid) {                       \
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,    \
                         .name = xname,                 \
+                        .subdevice = HDA_SUBDEV_NID_FLAG | nid, \
                         .info = alc_test_pin_ctl_info, \
                         .get = alc_test_pin_ctl_get,   \
                         .put = alc_test_pin_ctl_put,   \
@@ -3841,6 +3924,7 @@ static int alc_test_pin_src_put(struct snd_kcontrol *kcontrol,
 #define PIN_SRC_TEST(xname,nid) {                       \
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,    \
                         .name = xname,                 \
+                        .subdevice = HDA_SUBDEV_NID_FLAG | nid, \
                         .info = alc_test_pin_src_info, \
                         .get = alc_test_pin_src_get,   \
                         .put = alc_test_pin_src_put,   \
@@ -4380,7 +4464,7 @@ static int add_control(struct alc_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;
 }
@@ -5131,6 +5215,7 @@ static struct snd_kcontrol_new alc260_hp_output_mixer[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
+                .subdevice = HDA_SUBDEV_NID_FLAG | 0x11,
                 .info = snd_ctl_boolean_mono_info,
                 .get = alc260_hp_master_sw_get,
                 .put = alc260_hp_master_sw_put,
@@ -5169,6 +5254,7 @@ static struct snd_kcontrol_new alc260_hp_3013_mixer[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
+                .subdevice = HDA_SUBDEV_NID_FLAG | 0x11,
                 .info = snd_ctl_boolean_mono_info,
                 .get = alc260_hp_master_sw_get,
                 .put = alc260_hp_master_sw_put,
@@ -10248,8 +10334,14 @@ static int alc262_hp_master_sw_put(struct snd_kcontrol *kcontrol,
                 .info = snd_ctl_boolean_mono_info,              \
                 .get = alc262_hp_master_sw_get,                 \
                 .put = alc262_hp_master_sw_put,                 \
+        }, \
+        {                                                       \
+                .iface = NID_MAPPING,                           \
+                .name = "Master Playback Switch",               \
+                .private_value = 0x15 | (0x16 << 8) | (0x1b << 16),     \
         }
 
+
 static struct snd_kcontrol_new alc262_HP_BPC_mixer[] = {
         ALC262_HP_MASTER_SWITCH,
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
@@ -10407,6 +10499,12 @@ static int alc262_hippo_master_sw_put(struct snd_kcontrol *kcontrol,
                 .info = snd_ctl_boolean_mono_info,              \
                 .get = alc262_hippo_master_sw_get,              \
                 .put = alc262_hippo_master_sw_put,              \
+        },                                                      \
+        {                                                       \
+                .iface = NID_MAPPING,                           \
+                .name = "Master Playback Switch",               \
+                .subdevice = SUBDEV_HP(0) | (SUBDEV_LINE(0) << 8) | \
+                             (SUBDEV_SPEAKER(0) << 16), \
         }
 
 static struct snd_kcontrol_new alc262_hippo_mixer[] = {
@@ -10887,11 +10985,17 @@ static struct snd_kcontrol_new alc262_fujitsu_mixer[] = {
         {
                 .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 = alc262_fujitsu_master_sw_put,
                 .private_value = HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),
         },
+        {
+                .iface = NID_MAPPING,
+                .name = "Master Playback Switch",
+                .private_value = 0x1b,
+        },
         HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
         HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
@@ -10922,6 +11026,7 @@ static struct snd_kcontrol_new alc262_lenovo_3000_mixer[] = {
         {
                 .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 = alc262_lenovo_3000_master_sw_put,
@@ -11076,6 +11181,11 @@ static struct snd_kcontrol_new alc262_ultra_capture_mixer[] = {
                 .get = alc_mux_enum_get,
                 .put = alc262_ultra_mux_enum_put,
         },
+        {
+                .iface = NID_MAPPING,
+                .name = "Capture Source",
+                .private_value = 0x15,
+        },
         { } /* end */
 };
 
@@ -12094,6 +12204,7 @@ static struct snd_kcontrol_new alc268_acer_aspire_one_mixer[] = {
         {
                 .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 = alc268_acer_master_sw_put,
@@ -12109,6 +12220,7 @@ static struct snd_kcontrol_new alc268_acer_mixer[] = {
         {
                 .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 = alc268_acer_master_sw_put,
@@ -12126,6 +12238,7 @@ static struct snd_kcontrol_new alc268_acer_dmic_mixer[] = {
         {
                 .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 = alc268_acer_master_sw_put,
@@ -13078,6 +13191,7 @@ static struct snd_kcontrol_new alc269_quanta_fl1_mixer[] = {
         {
                 .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 = alc268_acer_master_sw_put,
@@ -13098,6 +13212,7 @@ static struct snd_kcontrol_new alc269_lifebook_mixer[] = {
         {
                 .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 = alc268_acer_master_sw_put,