ALSA: hda - Add setup hook to ALC preset struct

[firefly-linux-kernel-4.4.55.git] / sound / pci / hda / patch_realtek.c

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 7ecf929b97a5cf9e165386e77d0276aba51953a0..b2e097bdc59c023c092c0ca648078f558574a365 100644 (file)
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -379,6 +379,7 @@ struct alc_config_preset {
        unsigned int num_mux_defs;
        const struct hda_input_mux *input_mux;
        void (*unsol_event)(struct hda_codec *, unsigned int);
+       void (*setup)(struct hda_codec *);
        void (*init_hook)(struct hda_codec *);
 #ifdef CONFIG_SND_HDA_POWER_SAVE
        struct hda_amp_list *loopbacks;
@@ -851,9 +852,10 @@ static void print_realtek_coef(struct snd_info_buffer *buffer,
 /*
  * set up from the preset table
  */
-static void setup_preset(struct alc_spec *spec,
+static void setup_preset(struct hda_codec *codec,
                         const struct alc_config_preset *preset)
 {
+       struct alc_spec *spec = codec->spec;
        int i;
 
        for (i = 0; i < ARRAY_SIZE(preset->mixers) && preset->mixers[i]; i++)
@@ -895,6 +897,9 @@ static void setup_preset(struct alc_spec *spec,
 #ifdef CONFIG_SND_HDA_POWER_SAVE
        spec->loopback.amplist = preset->loopbacks;
 #endif
+
+       if (preset->setup)
+               preset->setup(codec);
 }
 
 /* Enable GPIO mask and set output */
@@ -987,16 +992,6 @@ static int get_connection_index(struct hda_codec *codec, hda_nid_t mux,
        return -1;
 }
 
-static int set_mic_mux_idx(struct hda_codec *codec, hda_nid_t cap,
-                          struct alc_mic_route *mic)
-{
-       int idx = get_connection_index(codec, cap, mic->pin);
-       if (idx < 0)
-               return 1; /* invalid */
-       mic->mux_idx = idx;
-       return 0;
-}
-
 static void alc_mic_automute(struct hda_codec *codec)
 {
        struct alc_spec *spec = codec->spec;
@@ -1004,6 +999,8 @@ static void alc_mic_automute(struct hda_codec *codec)
        unsigned int present, type;
        hda_nid_t cap_nid;
 
+       if (!spec->auto_mic)
+               return;
        if (!spec->int_mic.pin || !spec->ext_mic.pin)
                return;
        if (snd_BUG_ON(!spec->adc_nids))
@@ -1022,13 +1019,6 @@ static void alc_mic_automute(struct hda_codec *codec)
                dead = &spec->ext_mic;
        }
 
-       if (alive->mux_idx == MUX_IDX_UNDEF &&
-           set_mic_mux_idx(codec, cap_nid, alive))
-               return;
-       if (dead->mux_idx == MUX_IDX_UNDEF &&
-           set_mic_mux_idx(codec, cap_nid, dead))
-               return;
-
        type = get_wcaps_type(get_wcaps(codec, cap_nid));
        if (type == AC_WID_AUD_MIX) {
                /* Matrix-mixer style (e.g. ALC882) */
@@ -4671,8 +4661,42 @@ static void alc880_auto_init(struct hda_codec *codec)
                alc_inithook(codec);
 }
 
-static void set_capture_mixer(struct alc_spec *spec)
+/* check the ADC/MUX contains all input pins; some ADC/MUX contains only
+ * one of two digital mic pins, e.g. on ALC272
+ */
+static void fixup_automic_adc(struct hda_codec *codec)
+{
+       struct alc_spec *spec = codec->spec;
+       int i;
+
+       for (i = 0; i < spec->num_adc_nids; i++) {
+               hda_nid_t cap = spec->capsrc_nids ?
+                       spec->capsrc_nids[i] : spec->adc_nids[i];
+               int iidx, eidx;
+
+               iidx = get_connection_index(codec, cap, spec->int_mic.pin);
+               if (iidx < 0)
+                       continue;
+               eidx = get_connection_index(codec, cap, spec->ext_mic.pin);
+               if (eidx < 0)
+                       continue;
+               spec->int_mic.mux_idx = iidx;
+               spec->ext_mic.mux_idx = eidx;
+               if (spec->capsrc_nids)
+                       spec->capsrc_nids += i;
+               spec->adc_nids += i;
+               spec->num_adc_nids = 1;
+               return;
+       }
+       snd_printd(KERN_INFO "hda_codec: %s: "
+                  "No ADC/MUX containing both 0x%x and 0x%x pins\n",
+                  codec->chip_name, spec->int_mic.pin, spec->ext_mic.pin);
+       spec->auto_mic = 0; /* disable auto-mic to be sure */
+}
+
+static void set_capture_mixer(struct hda_codec *codec)
 {
+       struct alc_spec *spec = codec->spec;
        static struct snd_kcontrol_new *caps[2][3] = {
                { alc_capture_mixer_nosrc1,
                  alc_capture_mixer_nosrc2,
@@ -4685,7 +4709,7 @@ static void set_capture_mixer(struct alc_spec *spec)
                int mux;
                if (spec->auto_mic) {
                        mux = 0;
-                       spec->num_adc_nids = 1; /* support only one ADC */
+                       fixup_automic_adc(codec);
                } else if (spec->input_mux && spec->input_mux->num_items > 1)
                        mux = 1;
                else
@@ -4743,7 +4767,7 @@ static int patch_alc880(struct hda_codec *codec)
        }
 
        if (board_config != ALC880_AUTO)
-               setup_preset(spec, &alc880_presets[board_config]);
+               setup_preset(codec, &alc880_presets[board_config]);
 
        spec->stream_analog_playback = &alc880_pcm_analog_playback;
        spec->stream_analog_capture = &alc880_pcm_analog_capture;
@@ -4765,7 +4789,7 @@ static int patch_alc880(struct hda_codec *codec)
                        spec->num_adc_nids = ARRAY_SIZE(alc880_adc_nids);
                }
        }
-       set_capture_mixer(spec);
+       set_capture_mixer(codec);
        set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
 
        spec->vmaster_nid = 0x0c;
@@ -6387,7 +6411,7 @@ static int patch_alc260(struct hda_codec *codec)
        }
 
        if (board_config != ALC260_AUTO)
-               setup_preset(spec, &alc260_presets[board_config]);
+               setup_preset(codec, &alc260_presets[board_config]);
 
        spec->stream_analog_playback = &alc260_pcm_analog_playback;
        spec->stream_analog_capture = &alc260_pcm_analog_capture;
@@ -6408,7 +6432,7 @@ static int patch_alc260(struct hda_codec *codec)
                        spec->num_adc_nids = ARRAY_SIZE(alc260_adc_nids);
                }
        }
-       set_capture_mixer(spec);
+       set_capture_mixer(codec);
        set_beep_amp(spec, 0x07, 0x05, HDA_INPUT);
 
        spec->vmaster_nid = 0x08;
@@ -9701,7 +9725,7 @@ static int patch_alc882(struct hda_codec *codec)
        }
 
        if (board_config != ALC882_AUTO)
-               setup_preset(spec, &alc882_presets[board_config]);
+               setup_preset(codec, &alc882_presets[board_config]);
 
        spec->stream_analog_playback = &alc882_pcm_analog_playback;
        spec->stream_analog_capture = &alc882_pcm_analog_capture;
@@ -9737,7 +9761,7 @@ static int patch_alc882(struct hda_codec *codec)
                spec->capsrc_nids = spec->private_capsrc_nids;
        }
 
-       set_capture_mixer(spec);
+       set_capture_mixer(codec);
        set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
 
        spec->vmaster_nid = 0x0c;
@@ -11575,7 +11599,7 @@ static int patch_alc262(struct hda_codec *codec)
        }
 
        if (board_config != ALC262_AUTO)
-               setup_preset(spec, &alc262_presets[board_config]);
+               setup_preset(codec, &alc262_presets[board_config]);
 
        spec->stream_analog_playback = &alc262_pcm_analog_playback;
        spec->stream_analog_capture = &alc262_pcm_analog_capture;
@@ -11616,7 +11640,7 @@ static int patch_alc262(struct hda_codec *codec)
                }
        }
        if (!spec->cap_mixer && !spec->no_analog)
-               set_capture_mixer(spec);
+               set_capture_mixer(codec);
        if (!spec->no_analog)
                set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
 
@@ -12640,7 +12664,7 @@ static int patch_alc268(struct hda_codec *codec)
        }
 
        if (board_config != ALC268_AUTO)
-               setup_preset(spec, &alc268_presets[board_config]);
+               setup_preset(codec, &alc268_presets[board_config]);
 
        spec->stream_analog_playback = &alc268_pcm_analog_playback;
        spec->stream_analog_capture = &alc268_pcm_analog_capture;
@@ -13285,7 +13309,7 @@ static int alc269_parse_auto_config(struct hda_codec *codec)
                return err;
 
        if (!spec->cap_mixer && !spec->no_analog)
-               set_capture_mixer(spec);
+               set_capture_mixer(codec);
 
        alc_ssid_check(codec, 0x15, 0x1b, 0x14);
 
@@ -13464,7 +13488,7 @@ static int patch_alc269(struct hda_codec *codec)
        }
 
        if (board_config != ALC269_AUTO)
-               setup_preset(spec, &alc269_presets[board_config]);
+               setup_preset(codec, &alc269_presets[board_config]);
 
        if (codec->subsystem_id == 0x17aa3bf8) {
                /* Due to a hardware problem on Lenovo Ideadpad, we need to
@@ -13483,7 +13507,7 @@ static int patch_alc269(struct hda_codec *codec)
        spec->num_adc_nids = ARRAY_SIZE(alc269_adc_nids);
        spec->capsrc_nids = alc269_capsrc_nids;
        if (!spec->cap_mixer)
-               set_capture_mixer(spec);
+               set_capture_mixer(codec);
        set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT);
 
        spec->vmaster_nid = 0x02;
@@ -14398,7 +14422,7 @@ static int alc861_parse_auto_config(struct hda_codec *codec)
 
        spec->adc_nids = alc861_adc_nids;
        spec->num_adc_nids = ARRAY_SIZE(alc861_adc_nids);
-       set_capture_mixer(spec);
+       set_capture_mixer(codec);
 
        alc_ssid_check(codec, 0x0e, 0x0f, 0x0b);
 
@@ -14617,7 +14641,7 @@ static int patch_alc861(struct hda_codec *codec)
        }
 
        if (board_config != ALC861_AUTO)
-               setup_preset(spec, &alc861_presets[board_config]);
+               setup_preset(codec, &alc861_presets[board_config]);
 
        spec->stream_analog_playback = &alc861_pcm_analog_playback;
        spec->stream_analog_capture = &alc861_pcm_analog_capture;
@@ -15541,7 +15565,7 @@ static int patch_alc861vd(struct hda_codec *codec)
        }
 
        if (board_config != ALC861VD_AUTO)
-               setup_preset(spec, &alc861vd_presets[board_config]);
+               setup_preset(codec, &alc861vd_presets[board_config]);
 
        if (codec->vendor_id == 0x10ec0660) {
                /* always turn on EAPD */
@@ -15554,11 +15578,14 @@ static int patch_alc861vd(struct hda_codec *codec)
        spec->stream_digital_playback = &alc861vd_pcm_digital_playback;
        spec->stream_digital_capture = &alc861vd_pcm_digital_capture;
 
-       spec->adc_nids = alc861vd_adc_nids;
-       spec->num_adc_nids = ARRAY_SIZE(alc861vd_adc_nids);
-       spec->capsrc_nids = alc861vd_capsrc_nids;
+       if (!spec->adc_nids) {
+               spec->adc_nids = alc861vd_adc_nids;
+               spec->num_adc_nids = ARRAY_SIZE(alc861vd_adc_nids);
+       }
+       if (!spec->capsrc_nids)
+               spec->capsrc_nids = alc861vd_capsrc_nids;
 
-       set_capture_mixer(spec);
+       set_capture_mixer(codec);
        set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
 
        spec->vmaster_nid = 0x02;
@@ -15599,9 +15626,9 @@ static hda_nid_t alc272_dac_nids[2] = {
        0x02, 0x03
 };
 
-static hda_nid_t alc662_adc_nids[1] = {
+static hda_nid_t alc662_adc_nids[2] = {
        /* ADC1-2 */
-       0x09,
+       0x09, 0x08
 };
 
 static hda_nid_t alc272_adc_nids[1] = {
@@ -15609,7 +15636,7 @@ static hda_nid_t alc272_adc_nids[1] = {
        0x08,
 };
 
-static hda_nid_t alc662_capsrc_nids[1] = { 0x22 };
+static hda_nid_t alc662_capsrc_nids[2] = { 0x22, 0x23 };
 static hda_nid_t alc272_capsrc_nids[1] = { 0x23 };
 
 
@@ -17096,7 +17123,7 @@ static struct alc_config_preset alc662_presets[] = {
                .dac_nids = alc662_dac_nids,
                .num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
                .adc_nids = alc662_adc_nids,
-               .num_adc_nids = ARRAY_SIZE(alc662_adc_nids),
+               .num_adc_nids = 1,
                .capsrc_nids = alc662_capsrc_nids,
                .channel_mode = alc662_3ST_2ch_modes,
                .input_mux = &alc663_m51va_capture_source,
@@ -17446,7 +17473,7 @@ static int patch_alc662(struct hda_codec *codec)
        }
 
        if (board_config != ALC662_AUTO)
-               setup_preset(spec, &alc662_presets[board_config]);
+               setup_preset(codec, &alc662_presets[board_config]);
 
        spec->stream_analog_playback = &alc662_pcm_analog_playback;
        spec->stream_analog_capture = &alc662_pcm_analog_capture;
@@ -17454,12 +17481,15 @@ static int patch_alc662(struct hda_codec *codec)
        spec->stream_digital_playback = &alc662_pcm_digital_playback;
        spec->stream_digital_capture = &alc662_pcm_digital_capture;
 
-       spec->adc_nids = alc662_adc_nids;
-       spec->num_adc_nids = ARRAY_SIZE(alc662_adc_nids);
-       spec->capsrc_nids = alc662_capsrc_nids;
+       if (!spec->adc_nids) {
+               spec->adc_nids = alc662_adc_nids;
+               spec->num_adc_nids = ARRAY_SIZE(alc662_adc_nids);
+       }
+       if (!spec->capsrc_nids)
+               spec->capsrc_nids = alc662_capsrc_nids;
 
        if (!spec->cap_mixer)
-               set_capture_mixer(spec);
+               set_capture_mixer(codec);
        if (codec->vendor_id == 0x10ec0662)
                set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
        else