]> git.karo-electronics.de Git - linux-beck.git/blobdiff - sound/pci/hda/patch_realtek.c
Merge branch 'for-linus' into for-next
[linux-beck.git] / sound / pci / hda / patch_realtek.c
index 5faaad219a7f37e588e8b5a27b298cbb7adfa69d..de512c52fa96b960dc8b61fb67f31810bf74c04c 100644 (file)
@@ -27,6 +27,7 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/pci.h>
+#include <linux/dmi.h>
 #include <linux/module.h>
 #include <sound/core.h>
 #include <sound/jack.h>
 #include "hda_auto_parser.h"
 #include "hda_beep.h"
 #include "hda_jack.h"
+#include "hda_generic.h"
 
 /* unsol event tags */
-#define ALC_FRONT_EVENT                0x01
-#define ALC_DCVOL_EVENT                0x02
-#define ALC_HP_EVENT           0x04
-#define ALC_MIC_EVENT          0x08
+#define ALC_DCVOL_EVENT                0x08
 
 /* for GPIO Poll */
 #define GPIO_MASK      0x03
@@ -67,355 +66,42 @@ struct alc_customize_define {
        unsigned int  fixup:1; /* Means that this sku is set by driver, not read from hw */
 };
 
-struct alc_multi_io {
-       hda_nid_t pin;          /* multi-io widget pin NID */
-       hda_nid_t dac;          /* DAC to be connected */
-       unsigned int ctl_in;    /* cached input-pin control value */
-};
-
-enum {
-       ALC_AUTOMUTE_PIN,       /* change the pin control */
-       ALC_AUTOMUTE_AMP,       /* mute/unmute the pin AMP */
-       ALC_AUTOMUTE_MIXER,     /* mute/unmute mixer widget AMP */
-};
-
-#define MAX_VOL_NIDS   0x40
-
-/* make compatible with old code */
-#define alc_apply_pincfgs      snd_hda_apply_pincfgs
-#define alc_apply_fixup                snd_hda_apply_fixup
-#define alc_pick_fixup         snd_hda_pick_fixup
-#define alc_fixup              hda_fixup
-#define alc_pincfg             hda_pintbl
-#define alc_model_fixup                hda_model_fixup
-
-#define ALC_FIXUP_PINS HDA_FIXUP_PINS
-#define ALC_FIXUP_VERBS        HDA_FIXUP_VERBS
-#define ALC_FIXUP_FUNC HDA_FIXUP_FUNC
-
-#define ALC_FIXUP_ACT_PRE_PROBE        HDA_FIXUP_ACT_PRE_PROBE
-#define ALC_FIXUP_ACT_PROBE    HDA_FIXUP_ACT_PROBE
-#define ALC_FIXUP_ACT_INIT     HDA_FIXUP_ACT_INIT
-#define ALC_FIXUP_ACT_BUILD    HDA_FIXUP_ACT_BUILD
-
-
 struct alc_spec {
-       struct hda_gen_spec gen;
+       struct hda_gen_spec gen; /* must be at head */
 
        /* codec parameterization */
        const struct snd_kcontrol_new *mixers[5];       /* mixer arrays */
        unsigned int num_mixers;
-       const struct snd_kcontrol_new *cap_mixer;       /* capture mixer */
        unsigned int beep_amp;  /* beep amp value, set via set_beep_amp() */
 
-       char stream_name_analog[32];    /* analog PCM stream */
-       const struct hda_pcm_stream *stream_analog_playback;
-       const struct hda_pcm_stream *stream_analog_capture;
-       const struct hda_pcm_stream *stream_analog_alt_playback;
-       const struct hda_pcm_stream *stream_analog_alt_capture;
-
-       char stream_name_digital[32];   /* digital PCM stream */
-       const struct hda_pcm_stream *stream_digital_playback;
-       const struct hda_pcm_stream *stream_digital_capture;
-
-       /* playback */
-       struct hda_multi_out multiout;  /* playback set-up
-                                        * max_channels, dacs must be set
-                                        * dig_out_nid and hp_nid are optional
-                                        */
-       hda_nid_t alt_dac_nid;
-       hda_nid_t slave_dig_outs[3];    /* optional - for auto-parsing */
-       int dig_out_type;
-
-       /* capture */
-       unsigned int num_adc_nids;
-       const hda_nid_t *adc_nids;
-       const hda_nid_t *capsrc_nids;
-       hda_nid_t dig_in_nid;           /* digital-in NID; optional */
-       hda_nid_t mixer_nid;            /* analog-mixer NID */
-       DECLARE_BITMAP(vol_ctls, MAX_VOL_NIDS << 1);
-       DECLARE_BITMAP(sw_ctls, MAX_VOL_NIDS << 1);
-
-       /* capture setup for dynamic dual-adc switch */
-       hda_nid_t cur_adc;
-       unsigned int cur_adc_stream_tag;
-       unsigned int cur_adc_format;
-
-       /* capture source */
-       unsigned int num_mux_defs;
-       const struct hda_input_mux *input_mux;
-       unsigned int cur_mux[3];
-       hda_nid_t ext_mic_pin;
-       hda_nid_t dock_mic_pin;
-       hda_nid_t int_mic_pin;
-
-       /* channel model */
-       const struct hda_channel_mode *channel_mode;
-       int num_channel_mode;
-       int need_dac_fix;
-       int const_channel_count;        /* min. channel count (for speakers) */
-       int ext_channel_count;          /* current channel count for multi-io */
-
-       /* PCM information */
-       struct hda_pcm pcm_rec[3];      /* used in alc_build_pcms() */
-
-       /* dynamic controls, init_verbs and input_mux */
-       struct auto_pin_cfg autocfg;
        struct alc_customize_define cdefine;
-       struct snd_array kctls;
-       struct hda_input_mux private_imux[3];
-       hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS];
-       hda_nid_t private_adc_nids[AUTO_CFG_MAX_OUTS];
-       hda_nid_t private_capsrc_nids[AUTO_CFG_MAX_OUTS];
-       hda_nid_t imux_pins[HDA_MAX_NUM_INPUTS];
-       unsigned int dyn_adc_idx[HDA_MAX_NUM_INPUTS];
-       int int_mic_idx, ext_mic_idx, dock_mic_idx; /* for auto-mic */
+       unsigned int parse_flags; /* flag for snd_hda_parse_pin_defcfg() */
+
+       /* inverted dmic fix */
+       unsigned int inv_dmic_fixup:1; /* has inverted digital-mic workaround */
+       unsigned int inv_dmic_muted:1; /* R-ch of inv d-mic is muted? */
        hda_nid_t inv_dmic_pin;
 
+       /* mute LED for HP laptops, see alc269_fixup_mic_mute_hook() */
+       int mute_led_polarity;
+       hda_nid_t mute_led_nid;
+
        /* hooks */
        void (*init_hook)(struct hda_codec *codec);
 #ifdef CONFIG_PM
        void (*power_hook)(struct hda_codec *codec);
 #endif
        void (*shutup)(struct hda_codec *codec);
-       void (*automute_hook)(struct hda_codec *codec);
-
-       /* for pin sensing */
-       unsigned int hp_jack_present:1;
-       unsigned int line_jack_present:1;
-       unsigned int master_mute:1;
-       unsigned int auto_mic:1;
-       unsigned int auto_mic_valid_imux:1;     /* valid imux for auto-mic */
-       unsigned int automute_speaker:1; /* automute speaker outputs */
-       unsigned int automute_lo:1; /* automute LO outputs */
-       unsigned int detect_hp:1;       /* Headphone detection enabled */
-       unsigned int detect_lo:1;       /* Line-out detection enabled */
-       unsigned int automute_speaker_possible:1; /* there are speakers and either LO or HP */
-       unsigned int automute_lo_possible:1;      /* there are line outs and HP */
-       unsigned int keep_vref_in_automute:1; /* Don't clear VREF in automute */
-
-       /* other flags */
-       unsigned int no_analog :1; /* digital I/O only */
-       unsigned int dyn_adc_switch:1; /* switch ADCs (for ALC275) */
-       unsigned int single_input_src:1;
-       unsigned int vol_in_capsrc:1; /* use capsrc volume (ADC has no vol) */
-       unsigned int parse_flags; /* passed to snd_hda_parse_pin_defcfg() */
-       unsigned int shared_mic_hp:1; /* HP/Mic-in sharing */
-       unsigned int inv_dmic_fixup:1; /* has inverted digital-mic workaround */
-       unsigned int inv_dmic_muted:1; /* R-ch of inv d-mic is muted? */
-       unsigned int no_primary_hp:1; /* Don't prefer HP pins to speaker pins */
-
-       /* auto-mute control */
-       int automute_mode;
-       hda_nid_t automute_mixer_nid[AUTO_CFG_MAX_OUTS];
 
        int init_amp;
        int codec_variant;      /* flag for other variants */
 
-       /* for virtual master */
-       hda_nid_t vmaster_nid;
-       struct hda_vmaster_mute_hook vmaster_mute;
-#ifdef CONFIG_PM
-       struct hda_loopback_check loopback;
-       int num_loopbacks;
-       struct hda_amp_list loopback_list[8];
-#endif
-
        /* for PLL fix */
        hda_nid_t pll_nid;
        unsigned int pll_coef_idx, pll_coef_bit;
        unsigned int coef0;
-
-       /* multi-io */
-       int multi_ios;
-       struct alc_multi_io multi_io[4];
-
-       /* bind volumes */
-       struct snd_array bind_ctls;
 };
 
-static bool check_amp_caps(struct hda_codec *codec, hda_nid_t nid,
-                          int dir, unsigned int bits)
-{
-       if (!nid)
-               return false;
-       if (get_wcaps(codec, nid) & (1 << (dir + 1)))
-               if (query_amp_caps(codec, nid, dir) & bits)
-                       return true;
-       return false;
-}
-
-#define nid_has_mute(codec, nid, dir) \
-       check_amp_caps(codec, nid, dir, AC_AMPCAP_MUTE)
-#define nid_has_volume(codec, nid, dir) \
-       check_amp_caps(codec, nid, dir, AC_AMPCAP_NUM_STEPS)
-
-/*
- * input MUX handling
- */
-static int alc_mux_enum_info(struct snd_kcontrol *kcontrol,
-                            struct snd_ctl_elem_info *uinfo)
-{
-       struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-       struct alc_spec *spec = codec->spec;
-       unsigned int mux_idx = snd_ctl_get_ioffidx(kcontrol, &uinfo->id);
-       if (mux_idx >= spec->num_mux_defs)
-               mux_idx = 0;
-       if (!spec->input_mux[mux_idx].num_items && mux_idx > 0)
-               mux_idx = 0;
-       return snd_hda_input_mux_info(&spec->input_mux[mux_idx], uinfo);
-}
-
-static int alc_mux_enum_get(struct snd_kcontrol *kcontrol,
-                           struct snd_ctl_elem_value *ucontrol)
-{
-       struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-       struct alc_spec *spec = codec->spec;
-       unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
-
-       ucontrol->value.enumerated.item[0] = spec->cur_mux[adc_idx];
-       return 0;
-}
-
-static bool alc_dyn_adc_pcm_resetup(struct hda_codec *codec, int cur)
-{
-       struct alc_spec *spec = codec->spec;
-       hda_nid_t new_adc = spec->adc_nids[spec->dyn_adc_idx[cur]];
-
-       if (spec->cur_adc && spec->cur_adc != new_adc) {
-               /* stream is running, let's swap the current ADC */
-               __snd_hda_codec_cleanup_stream(codec, spec->cur_adc, 1);
-               spec->cur_adc = new_adc;
-               snd_hda_codec_setup_stream(codec, new_adc,
-                                          spec->cur_adc_stream_tag, 0,
-                                          spec->cur_adc_format);
-               return true;
-       }
-       return false;
-}
-
-static inline hda_nid_t get_capsrc(struct alc_spec *spec, int idx)
-{
-       return spec->capsrc_nids ?
-               spec->capsrc_nids[idx] : spec->adc_nids[idx];
-}
-
-static void call_update_outputs(struct hda_codec *codec);
-static void alc_inv_dmic_sync(struct hda_codec *codec, bool force);
-
-/* for shared I/O, change the pin-control accordingly */
-static void update_shared_mic_hp(struct hda_codec *codec, bool set_as_mic)
-{
-       struct alc_spec *spec = codec->spec;
-       unsigned int val;
-       hda_nid_t pin = spec->autocfg.inputs[1].pin;
-       /* NOTE: this assumes that there are only two inputs, the
-        * first is the real internal mic and the second is HP/mic jack.
-        */
-
-       val = snd_hda_get_default_vref(codec, pin);
-
-       /* This pin does not have vref caps - let's enable vref on pin 0x18
-          instead, as suggested by Realtek */
-       if (val == AC_PINCTL_VREF_HIZ) {
-               const hda_nid_t vref_pin = 0x18;
-               /* Sanity check pin 0x18 */
-               if (get_wcaps_type(get_wcaps(codec, vref_pin)) == AC_WID_PIN &&
-                   get_defcfg_connect(snd_hda_codec_get_pincfg(codec, vref_pin)) == AC_JACK_PORT_NONE) {
-                       unsigned int vref_val = snd_hda_get_default_vref(codec, vref_pin);
-                       if (vref_val != AC_PINCTL_VREF_HIZ)
-                               snd_hda_set_pin_ctl(codec, vref_pin, PIN_IN | (set_as_mic ? vref_val : 0));
-               }
-       }
-
-       val = set_as_mic ? val | PIN_IN : PIN_HP;
-       snd_hda_set_pin_ctl(codec, pin, val);
-
-       spec->automute_speaker = !set_as_mic;
-       call_update_outputs(codec);
-}
-
-/* select the given imux item; either unmute exclusively or select the route */
-static int alc_mux_select(struct hda_codec *codec, unsigned int adc_idx,
-                         unsigned int idx, bool force)
-{
-       struct alc_spec *spec = codec->spec;
-       const struct hda_input_mux *imux;
-       unsigned int mux_idx;
-       int i, type, num_conns;
-       hda_nid_t nid;
-
-       if (!spec->input_mux)
-               return 0;
-
-       mux_idx = adc_idx >= spec->num_mux_defs ? 0 : adc_idx;
-       imux = &spec->input_mux[mux_idx];
-       if (!imux->num_items && mux_idx > 0)
-               imux = &spec->input_mux[0];
-       if (!imux->num_items)
-               return 0;
-
-       if (idx >= imux->num_items)
-               idx = imux->num_items - 1;
-       if (spec->cur_mux[adc_idx] == idx && !force)
-               return 0;
-       spec->cur_mux[adc_idx] = idx;
-
-       if (spec->shared_mic_hp)
-               update_shared_mic_hp(codec, spec->cur_mux[adc_idx]);
-
-       if (spec->dyn_adc_switch) {
-               alc_dyn_adc_pcm_resetup(codec, idx);
-               adc_idx = spec->dyn_adc_idx[idx];
-       }
-
-       nid = get_capsrc(spec, adc_idx);
-
-       /* no selection? */
-       num_conns = snd_hda_get_num_conns(codec, nid);
-       if (num_conns <= 1)
-               return 1;
-
-       type = get_wcaps_type(get_wcaps(codec, nid));
-       if (type == AC_WID_AUD_MIX) {
-               /* Matrix-mixer style (e.g. ALC882) */
-               int active = imux->items[idx].index;
-               for (i = 0; i < num_conns; i++) {
-                       unsigned int v = (i == active) ? 0 : HDA_AMP_MUTE;
-                       snd_hda_codec_amp_stereo(codec, nid, HDA_INPUT, i,
-                                                HDA_AMP_MUTE, v);
-               }
-       } else {
-               /* MUX style (e.g. ALC880) */
-               snd_hda_codec_write_cache(codec, nid, 0,
-                                         AC_VERB_SET_CONNECT_SEL,
-                                         imux->items[idx].index);
-       }
-       alc_inv_dmic_sync(codec, true);
-       return 1;
-}
-
-static int alc_mux_enum_put(struct snd_kcontrol *kcontrol,
-                           struct snd_ctl_elem_value *ucontrol)
-{
-       struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-       unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
-       return alc_mux_select(codec, adc_idx,
-                             ucontrol->value.enumerated.item[0], false);
-}
-
-/*
- * set up the input pin config (depending on the given auto-pin type)
- */
-static void alc_set_input_pin(struct hda_codec *codec, hda_nid_t nid,
-                             int auto_pin_type)
-{
-       unsigned int val = PIN_IN;
-       if (auto_pin_type == AUTO_PIN_MIC)
-               val |= snd_hda_get_default_vref(codec, nid);
-       snd_hda_set_pin_ctl(codec, nid, val);
-}
-
 /*
  * Append the given mixer and verb elements for the later use
  * The mixer array is referred in build_controls(), and init_verbs are
@@ -485,171 +171,6 @@ static void alc_fix_pll_init(struct hda_codec *codec, hda_nid_t nid,
        alc_fix_pll(codec);
 }
 
-/*
- * Jack detections for HP auto-mute and mic-switch
- */
-
-/* check each pin in the given array; returns true if any of them is plugged */
-static bool detect_jacks(struct hda_codec *codec, int num_pins, hda_nid_t *pins)
-{
-       int i, present = 0;
-
-       for (i = 0; i < num_pins; i++) {
-               hda_nid_t nid = pins[i];
-               if (!nid)
-                       break;
-               present |= snd_hda_jack_detect(codec, nid);
-       }
-       return present;
-}
-
-/* standard HP/line-out auto-mute helper */
-static void do_automute(struct hda_codec *codec, int num_pins, hda_nid_t *pins,
-                       bool mute, bool hp_out)
-{
-       struct alc_spec *spec = codec->spec;
-       unsigned int mute_bits = mute ? HDA_AMP_MUTE : 0;
-       unsigned int pin_bits = mute ? 0 : (hp_out ? PIN_HP : PIN_OUT);
-       int i;
-
-       for (i = 0; i < num_pins; i++) {
-               hda_nid_t nid = pins[i];
-               unsigned int val;
-               if (!nid)
-                       break;
-               switch (spec->automute_mode) {
-               case ALC_AUTOMUTE_PIN:
-                       /* don't reset VREF value in case it's controlling
-                        * the amp (see alc861_fixup_asus_amp_vref_0f())
-                        */
-                       if (spec->keep_vref_in_automute) {
-                               val = snd_hda_codec_read(codec, nid, 0,
-                                       AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
-                               val &= ~PIN_HP;
-                       } else
-                               val = 0;
-                       val |= pin_bits;
-                       snd_hda_set_pin_ctl(codec, nid, val);
-                       break;
-               case ALC_AUTOMUTE_AMP:
-                       snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0,
-                                                HDA_AMP_MUTE, mute_bits);
-                       break;
-               case ALC_AUTOMUTE_MIXER:
-                       nid = spec->automute_mixer_nid[i];
-                       if (!nid)
-                               break;
-                       snd_hda_codec_amp_stereo(codec, nid, HDA_INPUT, 0,
-                                                HDA_AMP_MUTE, mute_bits);
-                       snd_hda_codec_amp_stereo(codec, nid, HDA_INPUT, 1,
-                                                HDA_AMP_MUTE, mute_bits);
-                       break;
-               }
-       }
-}
-
-/* Toggle outputs muting */
-static void update_outputs(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
-       int on;
-
-       /* Control HP pins/amps depending on master_mute state;
-        * in general, HP pins/amps control should be enabled in all cases,
-        * but currently set only for master_mute, just to be safe
-        */
-       if (!spec->shared_mic_hp) /* don't change HP-pin when shared with mic */
-               do_automute(codec, ARRAY_SIZE(spec->autocfg.hp_pins),
-                   spec->autocfg.hp_pins, spec->master_mute, true);
-
-       if (!spec->automute_speaker)
-               on = 0;
-       else
-               on = spec->hp_jack_present | spec->line_jack_present;
-       on |= spec->master_mute;
-       do_automute(codec, ARRAY_SIZE(spec->autocfg.speaker_pins),
-                   spec->autocfg.speaker_pins, on, false);
-
-       /* toggle line-out mutes if needed, too */
-       /* if LO is a copy of either HP or Speaker, don't need to handle it */
-       if (spec->autocfg.line_out_pins[0] == spec->autocfg.hp_pins[0] ||
-           spec->autocfg.line_out_pins[0] == spec->autocfg.speaker_pins[0])
-               return;
-       if (!spec->automute_lo)
-               on = 0;
-       else
-               on = spec->hp_jack_present;
-       on |= spec->master_mute;
-       do_automute(codec, ARRAY_SIZE(spec->autocfg.line_out_pins),
-                   spec->autocfg.line_out_pins, on, false);
-}
-
-static void call_update_outputs(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
-       if (spec->automute_hook)
-               spec->automute_hook(codec);
-       else
-               update_outputs(codec);
-}
-
-/* standard HP-automute helper */
-static void alc_hp_automute(struct hda_codec *codec, struct hda_jack_tbl *jack)
-{
-       struct alc_spec *spec = codec->spec;
-
-       spec->hp_jack_present =
-               detect_jacks(codec, ARRAY_SIZE(spec->autocfg.hp_pins),
-                            spec->autocfg.hp_pins);
-       if (!spec->detect_hp || (!spec->automute_speaker && !spec->automute_lo))
-               return;
-       call_update_outputs(codec);
-}
-
-/* standard line-out-automute helper */
-static void alc_line_automute(struct hda_codec *codec, struct hda_jack_tbl *jack)
-{
-       struct alc_spec *spec = codec->spec;
-
-       if (spec->autocfg.line_out_type == AUTO_PIN_SPEAKER_OUT)
-               return;
-       /* check LO jack only when it's different from HP */
-       if (spec->autocfg.line_out_pins[0] == spec->autocfg.hp_pins[0])
-               return;
-
-       spec->line_jack_present =
-               detect_jacks(codec, ARRAY_SIZE(spec->autocfg.line_out_pins),
-                            spec->autocfg.line_out_pins);
-       if (!spec->automute_speaker || !spec->detect_lo)
-               return;
-       call_update_outputs(codec);
-}
-
-#define get_connection_index(codec, mux, nid) \
-       snd_hda_get_conn_index(codec, mux, nid, 0)
-
-/* standard mic auto-switch helper */
-static void alc_mic_automute(struct hda_codec *codec, struct hda_jack_tbl *jack)
-{
-       struct alc_spec *spec = codec->spec;
-       hda_nid_t *pins = spec->imux_pins;
-
-       if (!spec->auto_mic || !spec->auto_mic_valid_imux)
-               return;
-       if (snd_BUG_ON(!spec->adc_nids))
-               return;
-       if (snd_BUG_ON(spec->int_mic_idx < 0 || spec->ext_mic_idx < 0))
-               return;
-
-       if (snd_hda_jack_detect(codec, pins[spec->ext_mic_idx]))
-               alc_mux_select(codec, 0, spec->ext_mic_idx, false);
-       else if (spec->dock_mic_idx >= 0 &&
-                  snd_hda_jack_detect(codec, pins[spec->dock_mic_idx]))
-               alc_mux_select(codec, 0, spec->dock_mic_idx, false);
-       else
-               alc_mux_select(codec, 0, spec->int_mic_idx, false);
-}
-
 /* update the master volume per volume-knob's unsol event */
 static void alc_update_knob_master(struct hda_codec *codec, struct hda_jack_tbl *jack)
 {
@@ -679,14 +200,6 @@ static void alc880_unsol_event(struct hda_codec *codec, unsigned int res)
        snd_hda_jack_unsol_event(codec, res >> 2);
 }
 
-/* call init functions of standard auto-mute helpers */
-static void alc_inithook(struct hda_codec *codec)
-{
-       alc_hp_automute(codec, NULL);
-       alc_line_automute(codec, NULL);
-       alc_mic_automute(codec, NULL);
-}
-
 /* additional initialization for ALC888 variants */
 static void alc888_coef_init(struct hda_codec *codec)
 {
@@ -807,435 +320,75 @@ static void alc_auto_init_amp(struct hda_codec *codec, int type)
        }
 }
 
+
 /*
- * Auto-Mute mode mixer enum support
+ * Realtek SSID verification
  */
-static int alc_automute_mode_info(struct snd_kcontrol *kcontrol,
-                                 struct snd_ctl_elem_info *uinfo)
-{
-       struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-       struct alc_spec *spec = codec->spec;
-       static const char * const texts3[] = {
-               "Disabled", "Speaker Only", "Line Out+Speaker"
-       };
-
-       if (spec->automute_speaker_possible && spec->automute_lo_possible)
-               return snd_hda_enum_helper_info(kcontrol, uinfo, 3, texts3);
-       return snd_hda_enum_bool_helper_info(kcontrol, uinfo);
-}
-
-static int alc_automute_mode_get(struct snd_kcontrol *kcontrol,
-                                struct snd_ctl_elem_value *ucontrol)
-{
-       struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-       struct alc_spec *spec = codec->spec;
-       unsigned int val = 0;
-       if (spec->automute_speaker)
-               val++;
-       if (spec->automute_lo)
-               val++;
 
-       ucontrol->value.enumerated.item[0] = val;
-       return 0;
-}
+/* Could be any non-zero and even value. When used as fixup, tells
+ * the driver to ignore any present sku defines.
+ */
+#define ALC_FIXUP_SKU_IGNORE (2)
 
-static int alc_automute_mode_put(struct snd_kcontrol *kcontrol,
-                                struct snd_ctl_elem_value *ucontrol)
+static void alc_fixup_sku_ignore(struct hda_codec *codec,
+                                const struct hda_fixup *fix, int action)
 {
-       struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
        struct alc_spec *spec = codec->spec;
-
-       switch (ucontrol->value.enumerated.item[0]) {
-       case 0:
-               if (!spec->automute_speaker && !spec->automute_lo)
-                       return 0;
-               spec->automute_speaker = 0;
-               spec->automute_lo = 0;
-               break;
-       case 1:
-               if (spec->automute_speaker_possible) {
-                       if (!spec->automute_lo && spec->automute_speaker)
-                               return 0;
-                       spec->automute_speaker = 1;
-                       spec->automute_lo = 0;
-               } else if (spec->automute_lo_possible) {
-                       if (spec->automute_lo)
-                               return 0;
-                       spec->automute_lo = 1;
-               } else
-                       return -EINVAL;
-               break;
-       case 2:
-               if (!spec->automute_lo_possible || !spec->automute_speaker_possible)
-                       return -EINVAL;
-               if (spec->automute_speaker && spec->automute_lo)
-                       return 0;
-               spec->automute_speaker = 1;
-               spec->automute_lo = 1;
-               break;
-       default:
-               return -EINVAL;
+       if (action == HDA_FIXUP_ACT_PRE_PROBE) {
+               spec->cdefine.fixup = 1;
+               spec->cdefine.sku_cfg = ALC_FIXUP_SKU_IGNORE;
        }
-       call_update_outputs(codec);
-       return 1;
-}
-
-static const struct snd_kcontrol_new alc_automute_mode_enum = {
-       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-       .name = "Auto-Mute Mode",
-       .info = alc_automute_mode_info,
-       .get = alc_automute_mode_get,
-       .put = alc_automute_mode_put,
-};
-
-static struct snd_kcontrol_new *
-alc_kcontrol_new(struct alc_spec *spec, const char *name,
-                const struct snd_kcontrol_new *temp)
-{
-       struct snd_kcontrol_new *knew = snd_array_new(&spec->kctls);
-       if (!knew)
-               return NULL;
-       *knew = *temp;
-       knew->name = kstrdup(name, GFP_KERNEL);
-       if (!knew->name)
-               return NULL;
-       return knew;
-}
-
-static int alc_add_automute_mode_enum(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
-
-       if (!alc_kcontrol_new(spec, "Auto-Mute Mode", &alc_automute_mode_enum))
-               return -ENOMEM;
-       return 0;
 }
 
-/*
- * Check the availability of HP/line-out auto-mute;
- * Set up appropriately if really supported
- */
-static int alc_init_automute(struct hda_codec *codec)
+static int alc_auto_parse_customize_define(struct hda_codec *codec)
 {
+       unsigned int ass, tmp, i;
+       unsigned nid = 0;
        struct alc_spec *spec = codec->spec;
-       struct auto_pin_cfg *cfg = &spec->autocfg;
-       int present = 0;
-       int i, err;
 
-       if (cfg->hp_pins[0])
-               present++;
-       if (cfg->line_out_pins[0])
-               present++;
-       if (cfg->speaker_pins[0])
-               present++;
-       if (present < 2) /* need two different output types */
-               return 0;
+       spec->cdefine.enable_pcbeep = 1; /* assume always enabled */
 
-       if (!cfg->speaker_pins[0] &&
-           cfg->line_out_type == AUTO_PIN_SPEAKER_OUT) {
-               memcpy(cfg->speaker_pins, cfg->line_out_pins,
-                      sizeof(cfg->speaker_pins));
-               cfg->speaker_outs = cfg->line_outs;
+       if (spec->cdefine.fixup) {
+               ass = spec->cdefine.sku_cfg;
+               if (ass == ALC_FIXUP_SKU_IGNORE)
+                       return -1;
+               goto do_sku;
        }
 
-       if (!cfg->hp_pins[0] &&
-           cfg->line_out_type == AUTO_PIN_HP_OUT) {
-               memcpy(cfg->hp_pins, cfg->line_out_pins,
-                      sizeof(cfg->hp_pins));
-               cfg->hp_outs = cfg->line_outs;
-       }
+       ass = codec->subsystem_id & 0xffff;
+       if (ass != codec->bus->pci->subsystem_device && (ass & 1))
+               goto do_sku;
 
-       spec->automute_mode = ALC_AUTOMUTE_PIN;
+       nid = 0x1d;
+       if (codec->vendor_id == 0x10ec0260)
+               nid = 0x17;
+       ass = snd_hda_codec_get_pincfg(codec, nid);
 
-       for (i = 0; i < cfg->hp_outs; i++) {
-               hda_nid_t nid = cfg->hp_pins[i];
-               if (!is_jack_detectable(codec, nid))
-                       continue;
-               snd_printdd("realtek: Enable HP auto-muting on NID 0x%x\n",
-                           nid);
-               snd_hda_jack_detect_enable_callback(codec, nid, ALC_HP_EVENT,
-                                                   alc_hp_automute);
-               spec->detect_hp = 1;
+       if (!(ass & 1)) {
+               printk(KERN_INFO "hda_codec: %s: SKU not ready 0x%08x\n",
+                      codec->chip_name, ass);
+               return -1;
        }
 
-       if (cfg->line_out_type == AUTO_PIN_LINE_OUT && cfg->line_outs) {
-               if (cfg->speaker_outs)
-                       for (i = 0; i < cfg->line_outs; i++) {
-                               hda_nid_t nid = cfg->line_out_pins[i];
-                               if (!is_jack_detectable(codec, nid))
-                                       continue;
-                               snd_printdd("realtek: Enable Line-Out "
-                                           "auto-muting on NID 0x%x\n", nid);
-                               snd_hda_jack_detect_enable_callback(codec, nid, ALC_FRONT_EVENT,
-                                                                   alc_line_automute);
-                               spec->detect_lo = 1;
-                       }
-               spec->automute_lo_possible = spec->detect_hp;
+       /* check sum */
+       tmp = 0;
+       for (i = 1; i < 16; i++) {
+               if ((ass >> i) & 1)
+                       tmp++;
        }
+       if (((ass >> 16) & 0xf) != tmp)
+               return -1;
 
-       spec->automute_speaker_possible = cfg->speaker_outs &&
-               (spec->detect_hp || spec->detect_lo);
-
-       spec->automute_lo = spec->automute_lo_possible;
-       spec->automute_speaker = spec->automute_speaker_possible;
-
-       if (spec->automute_speaker_possible || spec->automute_lo_possible) {
-               /* create a control for automute mode */
-               err = alc_add_automute_mode_enum(codec);
-               if (err < 0)
-                       return err;
-       }
-       return 0;
-}
-
-/* return the position of NID in the list, or -1 if not found */
-static int find_idx_in_nid_list(hda_nid_t nid, const hda_nid_t *list, int nums)
-{
-       int i;
-       for (i = 0; i < nums; i++)
-               if (list[i] == nid)
-                       return i;
-       return -1;
-}
-
-/* check whether dynamic ADC-switching is available */
-static bool alc_check_dyn_adc_switch(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
-       struct hda_input_mux *imux = &spec->private_imux[0];
-       int i, n, idx;
-       hda_nid_t cap, pin;
-
-       if (imux != spec->input_mux) /* no dynamic imux? */
-               return false;
-
-       for (n = 0; n < spec->num_adc_nids; n++) {
-               cap = spec->private_capsrc_nids[n];
-               for (i = 0; i < imux->num_items; i++) {
-                       pin = spec->imux_pins[i];
-                       if (!pin)
-                               return false;
-                       if (get_connection_index(codec, cap, pin) < 0)
-                               break;
-               }
-               if (i >= imux->num_items)
-                       return true; /* no ADC-switch is needed */
-       }
-
-       for (i = 0; i < imux->num_items; i++) {
-               pin = spec->imux_pins[i];
-               for (n = 0; n < spec->num_adc_nids; n++) {
-                       cap = spec->private_capsrc_nids[n];
-                       idx = get_connection_index(codec, cap, pin);
-                       if (idx >= 0) {
-                               imux->items[i].index = idx;
-                               spec->dyn_adc_idx[i] = n;
-                               break;
-                       }
-               }
-       }
-
-       snd_printdd("realtek: enabling ADC switching\n");
-       spec->dyn_adc_switch = 1;
-       return true;
-}
-
-/* check whether all auto-mic pins are valid; setup indices if OK */
-static bool alc_auto_mic_check_imux(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
-       const struct hda_input_mux *imux;
-
-       if (!spec->auto_mic)
-               return false;
-       if (spec->auto_mic_valid_imux)
-               return true; /* already checked */
-
-       /* fill up imux indices */
-       if (!alc_check_dyn_adc_switch(codec)) {
-               spec->auto_mic = 0;
-               return false;
-       }
-
-       imux = spec->input_mux;
-       spec->ext_mic_idx = find_idx_in_nid_list(spec->ext_mic_pin,
-                                       spec->imux_pins, imux->num_items);
-       spec->int_mic_idx = find_idx_in_nid_list(spec->int_mic_pin,
-                                       spec->imux_pins, imux->num_items);
-       spec->dock_mic_idx = find_idx_in_nid_list(spec->dock_mic_pin,
-                                       spec->imux_pins, imux->num_items);
-       if (spec->ext_mic_idx < 0 || spec->int_mic_idx < 0) {
-               spec->auto_mic = 0;
-               return false; /* no corresponding imux */
-       }
-
-       snd_hda_jack_detect_enable_callback(codec, spec->ext_mic_pin,
-                                           ALC_MIC_EVENT, alc_mic_automute);
-       if (spec->dock_mic_pin)
-               snd_hda_jack_detect_enable_callback(codec, spec->dock_mic_pin,
-                                                   ALC_MIC_EVENT,
-                                                   alc_mic_automute);
-
-       spec->auto_mic_valid_imux = 1;
-       spec->auto_mic = 1;
-       return true;
-}
-
-/*
- * Check the availability of auto-mic switch;
- * Set up if really supported
- */
-static int alc_init_auto_mic(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
-       struct auto_pin_cfg *cfg = &spec->autocfg;
-       hda_nid_t fixed, ext, dock;
-       int i;
-
-       if (spec->shared_mic_hp)
-               return 0; /* no auto-mic for the shared I/O */
-
-       spec->ext_mic_idx = spec->int_mic_idx = spec->dock_mic_idx = -1;
-
-       fixed = ext = dock = 0;
-       for (i = 0; i < cfg->num_inputs; i++) {
-               hda_nid_t nid = cfg->inputs[i].pin;
-               unsigned int defcfg;
-               defcfg = snd_hda_codec_get_pincfg(codec, nid);
-               switch (snd_hda_get_input_pin_attr(defcfg)) {
-               case INPUT_PIN_ATTR_INT:
-                       if (fixed)
-                               return 0; /* already occupied */
-                       if (cfg->inputs[i].type != AUTO_PIN_MIC)
-                               return 0; /* invalid type */
-                       fixed = nid;
-                       break;
-               case INPUT_PIN_ATTR_UNUSED:
-                       return 0; /* invalid entry */
-               case INPUT_PIN_ATTR_DOCK:
-                       if (dock)
-                               return 0; /* already occupied */
-                       if (cfg->inputs[i].type > AUTO_PIN_LINE_IN)
-                               return 0; /* invalid type */
-                       dock = nid;
-                       break;
-               default:
-                       if (ext)
-                               return 0; /* already occupied */
-                       if (cfg->inputs[i].type != AUTO_PIN_MIC)
-                               return 0; /* invalid type */
-                       ext = nid;
-                       break;
-               }
-       }
-       if (!ext && dock) {
-               ext = dock;
-               dock = 0;
-       }
-       if (!ext || !fixed)
-               return 0;
-       if (!is_jack_detectable(codec, ext))
-               return 0; /* no unsol support */
-       if (dock && !is_jack_detectable(codec, dock))
-               return 0; /* no unsol support */
-
-       /* check imux indices */
-       spec->ext_mic_pin = ext;
-       spec->int_mic_pin = fixed;
-       spec->dock_mic_pin = dock;
-
-       spec->auto_mic = 1;
-       if (!alc_auto_mic_check_imux(codec))
-               return 0;
-
-       snd_printdd("realtek: Enable auto-mic switch on NID 0x%x/0x%x/0x%x\n",
-                   ext, fixed, dock);
-
-       return 0;
-}
-
-/* check the availabilities of auto-mute and auto-mic switches */
-static int alc_auto_check_switches(struct hda_codec *codec)
-{
-       int err;
-
-       err = alc_init_automute(codec);
-       if (err < 0)
-               return err;
-       err = alc_init_auto_mic(codec);
-       if (err < 0)
-               return err;
-       return 0;
-}
-
-/*
- * Realtek SSID verification
- */
-
-/* Could be any non-zero and even value. When used as fixup, tells
- * the driver to ignore any present sku defines.
- */
-#define ALC_FIXUP_SKU_IGNORE (2)
-
-static void alc_fixup_sku_ignore(struct hda_codec *codec,
-                                const struct hda_fixup *fix, int action)
-{
-       struct alc_spec *spec = codec->spec;
-       if (action == HDA_FIXUP_ACT_PRE_PROBE) {
-               spec->cdefine.fixup = 1;
-               spec->cdefine.sku_cfg = ALC_FIXUP_SKU_IGNORE;
-       }
-}
-
-static int alc_auto_parse_customize_define(struct hda_codec *codec)
-{
-       unsigned int ass, tmp, i;
-       unsigned nid = 0;
-       struct alc_spec *spec = codec->spec;
-
-       spec->cdefine.enable_pcbeep = 1; /* assume always enabled */
-
-       if (spec->cdefine.fixup) {
-               ass = spec->cdefine.sku_cfg;
-               if (ass == ALC_FIXUP_SKU_IGNORE)
-                       return -1;
-               goto do_sku;
-       }
-
-       ass = codec->subsystem_id & 0xffff;
-       if (ass != codec->bus->pci->subsystem_device && (ass & 1))
-               goto do_sku;
-
-       nid = 0x1d;
-       if (codec->vendor_id == 0x10ec0260)
-               nid = 0x17;
-       ass = snd_hda_codec_get_pincfg(codec, nid);
-
-       if (!(ass & 1)) {
-               printk(KERN_INFO "hda_codec: %s: SKU not ready 0x%08x\n",
-                      codec->chip_name, ass);
-               return -1;
-       }
-
-       /* check sum */
-       tmp = 0;
-       for (i = 1; i < 16; i++) {
-               if ((ass >> i) & 1)
-                       tmp++;
-       }
-       if (((ass >> 16) & 0xf) != tmp)
-               return -1;
-
-       spec->cdefine.port_connectivity = ass >> 30;
-       spec->cdefine.enable_pcbeep = (ass & 0x100000) >> 20;
-       spec->cdefine.check_sum = (ass >> 16) & 0xf;
-       spec->cdefine.customization = ass >> 8;
-do_sku:
-       spec->cdefine.sku_cfg = ass;
-       spec->cdefine.external_amp = (ass & 0x38) >> 3;
-       spec->cdefine.platform_type = (ass & 0x4) >> 2;
-       spec->cdefine.swap = (ass & 0x2) >> 1;
-       spec->cdefine.override = ass & 0x1;
+       spec->cdefine.port_connectivity = ass >> 30;
+       spec->cdefine.enable_pcbeep = (ass & 0x100000) >> 20;
+       spec->cdefine.check_sum = (ass >> 16) & 0xf;
+       spec->cdefine.customization = ass >> 8;
+do_sku:
+       spec->cdefine.sku_cfg = ass;
+       spec->cdefine.external_amp = (ass & 0x38) >> 3;
+       spec->cdefine.platform_type = (ass & 0x4) >> 2;
+       spec->cdefine.swap = (ass & 0x2) >> 1;
+       spec->cdefine.override = ass & 0x1;
 
        snd_printd("SKU: Nid=0x%x sku_cfg=0x%08x\n",
                   nid, spec->cdefine.sku_cfg);
@@ -1252,6 +405,15 @@ do_sku:
        return 0;
 }
 
+/* return the position of NID in the list, or -1 if not found */
+static int find_idx_in_nid_list(hda_nid_t nid, const hda_nid_t *list, int nums)
+{
+       int i;
+       for (i = 0; i < nums; i++)
+               if (list[i] == nid)
+                       return i;
+       return -1;
+}
 /* return true if the given NID is found in the list */
 static bool found_in_nid_list(hda_nid_t nid, const hda_nid_t *list, int nums)
 {
@@ -1354,9 +516,9 @@ do_sku:
         * 15   : 1 --> enable the function "Mute internal speaker
         *              when the external headphone out jack is plugged"
         */
-       if (!spec->autocfg.hp_pins[0] &&
-           !(spec->autocfg.line_out_pins[0] &&
-             spec->autocfg.line_out_type == AUTO_PIN_HP_OUT)) {
+       if (!spec->gen.autocfg.hp_pins[0] &&
+           !(spec->gen.autocfg.line_out_pins[0] &&
+             spec->gen.autocfg.line_out_type == AUTO_PIN_HP_OUT)) {
                hda_nid_t nid;
                tmp = (ass >> 11) & 0x3;        /* HP to chassis */
                if (tmp == 0)
@@ -1369,10 +531,10 @@ do_sku:
                        nid = porti;
                else
                        return 1;
-               if (found_in_nid_list(nid, spec->autocfg.line_out_pins,
-                                     spec->autocfg.line_outs))
+               if (found_in_nid_list(nid, spec->gen.autocfg.line_out_pins,
+                                     spec->gen.autocfg.line_outs))
                        return 1;
-               spec->autocfg.hp_pins[0] = nid;
+               spec->gen.autocfg.hp_pins[0] = nid;
        }
        return 1;
 }
@@ -1422,252 +584,54 @@ static unsigned int alc_get_coef0(struct hda_codec *codec)
 }
 
 /*
- * Digital I/O handling
- */
-
-/* set right pin controls for digital I/O */
-static void alc_auto_init_digital(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
-       int i;
-       hda_nid_t pin, dac;
-
-       for (i = 0; i < spec->autocfg.dig_outs; i++) {
-               pin = spec->autocfg.dig_out_pins[i];
-               if (!pin)
-                       continue;
-               snd_hda_set_pin_ctl(codec, pin, PIN_OUT);
-               if (!i)
-                       dac = spec->multiout.dig_out_nid;
-               else
-                       dac = spec->slave_dig_outs[i - 1];
-               if (!dac || !(get_wcaps(codec, dac) & AC_WCAP_OUT_AMP))
-                       continue;
-               snd_hda_codec_write(codec, dac, 0,
-                                   AC_VERB_SET_AMP_GAIN_MUTE,
-                                   AMP_OUT_UNMUTE);
-       }
-       pin = spec->autocfg.dig_in_pin;
-       if (pin)
-               snd_hda_set_pin_ctl(codec, pin, PIN_IN);
-}
-
-/* parse digital I/Os and set up NIDs in BIOS auto-parse mode */
-static void alc_auto_parse_digital(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
-       int i, err, nums;
-       hda_nid_t dig_nid;
-
-       /* support multiple SPDIFs; the secondary is set up as a slave */
-       nums = 0;
-       for (i = 0; i < spec->autocfg.dig_outs; i++) {
-               hda_nid_t conn[4];
-               err = snd_hda_get_connections(codec,
-                                             spec->autocfg.dig_out_pins[i],
-                                             conn, ARRAY_SIZE(conn));
-               if (err <= 0)
-                       continue;
-               dig_nid = conn[0]; /* assume the first element is audio-out */
-               if (!nums) {
-                       spec->multiout.dig_out_nid = dig_nid;
-                       spec->dig_out_type = spec->autocfg.dig_out_type[0];
-               } else {
-                       spec->multiout.slave_dig_outs = spec->slave_dig_outs;
-                       if (nums >= ARRAY_SIZE(spec->slave_dig_outs) - 1)
-                               break;
-                       spec->slave_dig_outs[nums - 1] = dig_nid;
-               }
-               nums++;
-       }
-
-       if (spec->autocfg.dig_in_pin) {
-               dig_nid = codec->start_nid;
-               for (i = 0; i < codec->num_nodes; i++, dig_nid++) {
-                       unsigned int wcaps = get_wcaps(codec, dig_nid);
-                       if (get_wcaps_type(wcaps) != AC_WID_AUD_IN)
-                               continue;
-                       if (!(wcaps & AC_WCAP_DIGITAL))
-                               continue;
-                       if (!(wcaps & AC_WCAP_CONN_LIST))
-                               continue;
-                       err = get_connection_index(codec, dig_nid,
-                                                  spec->autocfg.dig_in_pin);
-                       if (err >= 0) {
-                               spec->dig_in_nid = dig_nid;
-                               break;
-                       }
-               }
-       }
-}
-
-/*
- * capture mixer elements
  */
-static int alc_cap_vol_info(struct snd_kcontrol *kcontrol,
-                           struct snd_ctl_elem_info *uinfo)
-{
-       struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-       struct alc_spec *spec = codec->spec;
-       unsigned long val;
-       int err;
-
-       mutex_lock(&codec->control_mutex);
-       if (spec->vol_in_capsrc)
-               val = HDA_COMPOSE_AMP_VAL(spec->capsrc_nids[0], 3, 0, HDA_OUTPUT);
-       else
-               val = HDA_COMPOSE_AMP_VAL(spec->adc_nids[0], 3, 0, HDA_INPUT);
-       kcontrol->private_value = val;
-       err = snd_hda_mixer_amp_volume_info(kcontrol, uinfo);
-       mutex_unlock(&codec->control_mutex);
-       return err;
-}
 
-static int alc_cap_vol_tlv(struct snd_kcontrol *kcontrol, int op_flag,
-                          unsigned int size, unsigned int __user *tlv)
+static hda_nid_t get_adc_nid(struct hda_codec *codec, int adc_idx, int imux_idx)
 {
-       struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-       struct alc_spec *spec = codec->spec;
-       unsigned long val;
-       int err;
-
-       mutex_lock(&codec->control_mutex);
-       if (spec->vol_in_capsrc)
-               val = HDA_COMPOSE_AMP_VAL(spec->capsrc_nids[0], 3, 0, HDA_OUTPUT);
-       else
-               val = HDA_COMPOSE_AMP_VAL(spec->adc_nids[0], 3, 0, HDA_INPUT);
-       kcontrol->private_value = val;
-       err = snd_hda_mixer_amp_tlv(kcontrol, op_flag, size, tlv);
-       mutex_unlock(&codec->control_mutex);
-       return err;
+       struct hda_gen_spec *spec = codec->spec;
+       if (spec->dyn_adc_switch)
+               adc_idx = spec->dyn_adc_idx[imux_idx];
+       return spec->adc_nids[adc_idx];
 }
 
-typedef int (*getput_call_t)(struct snd_kcontrol *kcontrol,
-                            struct snd_ctl_elem_value *ucontrol);
-
-static int alc_cap_getput_caller(struct snd_kcontrol *kcontrol,
-                                struct snd_ctl_elem_value *ucontrol,
-                                getput_call_t func, bool is_put)
+static void alc_inv_dmic_sync_adc(struct hda_codec *codec, int adc_idx)
 {
-       struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
        struct alc_spec *spec = codec->spec;
-       int i, err = 0;
-
-       mutex_lock(&codec->control_mutex);
-       if (is_put && spec->dyn_adc_switch) {
-               for (i = 0; i < spec->num_adc_nids; i++) {
-                       kcontrol->private_value =
-                               HDA_COMPOSE_AMP_VAL(spec->adc_nids[i],
-                                                   3, 0, HDA_INPUT);
-                       err = func(kcontrol, ucontrol);
-                       if (err < 0)
-                               goto error;
-               }
-       } else {
-               i = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
-               if (spec->vol_in_capsrc)
-                       kcontrol->private_value =
-                               HDA_COMPOSE_AMP_VAL(spec->capsrc_nids[i],
-                                                   3, 0, HDA_OUTPUT);
-               else
-                       kcontrol->private_value =
-                               HDA_COMPOSE_AMP_VAL(spec->adc_nids[i],
-                                                   3, 0, HDA_INPUT);
-               err = func(kcontrol, ucontrol);
-       }
-       if (err >= 0 && is_put)
-               alc_inv_dmic_sync(codec, false);
- error:
-       mutex_unlock(&codec->control_mutex);
-       return err;
-}
-
-static int alc_cap_vol_get(struct snd_kcontrol *kcontrol,
-                          struct snd_ctl_elem_value *ucontrol)
-{
-       return alc_cap_getput_caller(kcontrol, ucontrol,
-                                    snd_hda_mixer_amp_volume_get, false);
-}
-
-static int alc_cap_vol_put(struct snd_kcontrol *kcontrol,
-                          struct snd_ctl_elem_value *ucontrol)
-{
-       return alc_cap_getput_caller(kcontrol, ucontrol,
-                                    snd_hda_mixer_amp_volume_put, true);
-}
-
-/* capture mixer elements */
-#define alc_cap_sw_info                snd_ctl_boolean_stereo_info
-
-static int alc_cap_sw_get(struct snd_kcontrol *kcontrol,
-                         struct snd_ctl_elem_value *ucontrol)
-{
-       return alc_cap_getput_caller(kcontrol, ucontrol,
-                                    snd_hda_mixer_amp_switch_get, false);
-}
-
-static int alc_cap_sw_put(struct snd_kcontrol *kcontrol,
-                         struct snd_ctl_elem_value *ucontrol)
-{
-       return alc_cap_getput_caller(kcontrol, ucontrol,
-                                    snd_hda_mixer_amp_switch_put, true);
-}
+       struct hda_input_mux *imux = &spec->gen.input_mux;
+       struct nid_path *path;
+       hda_nid_t nid;
+       int i, dir, parm;
+       unsigned int val;
 
-#define _DEFINE_CAPMIX(num) \
-       { \
-               .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
-               .name = "Capture Switch", \
-               .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, \
-               .count = num, \
-               .info = alc_cap_sw_info, \
-               .get = alc_cap_sw_get, \
-               .put = alc_cap_sw_put, \
-       }, \
-       { \
-               .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
-               .name = "Capture Volume", \
-               .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE | \
-                          SNDRV_CTL_ELEM_ACCESS_TLV_READ | \
-                          SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK), \
-               .count = num, \
-               .info = alc_cap_vol_info, \
-               .get = alc_cap_vol_get, \
-               .put = alc_cap_vol_put, \
-               .tlv = { .c = alc_cap_vol_tlv }, \
+       for (i = 0; i < imux->num_items; i++) {
+               if (spec->gen.imux_pins[i] == spec->inv_dmic_pin)
+                       break;
        }
+       if (i >= imux->num_items)
+               return;
 
-#define _DEFINE_CAPSRC(num) \
-       { \
-               .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
-               /* .name = "Capture Source", */ \
-               .name = "Input Source", \
-               .count = num, \
-               .info = alc_mux_enum_info, \
-               .get = alc_mux_enum_get, \
-               .put = alc_mux_enum_put, \
-       }
+       path = snd_hda_get_nid_path(codec, spec->inv_dmic_pin,
+                                   get_adc_nid(codec, adc_idx, i));
+       val = path->ctls[NID_PATH_MUTE_CTL];
+       if (!val)
+               return;
+       nid = get_amp_nid_(val);
+       dir = get_amp_direction_(val);
+       parm = AC_AMP_SET_RIGHT |
+               (dir == HDA_OUTPUT ? AC_AMP_SET_OUTPUT : AC_AMP_SET_INPUT);
 
-#define DEFINE_CAPMIX(num) \
-static const struct snd_kcontrol_new alc_capture_mixer ## num[] = { \
-       _DEFINE_CAPMIX(num),                                  \
-       _DEFINE_CAPSRC(num),                                  \
-       { } /* end */                                         \
-}
+       /* flush all cached amps at first */
+       snd_hda_codec_flush_cache(codec);
 
-#define DEFINE_CAPMIX_NOSRC(num) \
-static const struct snd_kcontrol_new alc_capture_mixer_nosrc ## num[] = { \
-       _DEFINE_CAPMIX(num),                                        \
-       { } /* end */                                               \
+       /* we care only right channel */
+       val = snd_hda_codec_amp_read(codec, nid, 1, dir, 0);
+       if (val & 0x80) /* if already muted, we don't need to touch */
+               return;
+       val |= 0x80;
+       snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                           parm | val);
 }
 
-/* up to three ADCs */
-DEFINE_CAPMIX(1);
-DEFINE_CAPMIX(2);
-DEFINE_CAPMIX(3);
-DEFINE_CAPMIX_NOSRC(1);
-DEFINE_CAPMIX_NOSRC(2);
-DEFINE_CAPMIX_NOSRC(3);
-
 /*
  * Inverted digital-mic handling
  *
@@ -1686,43 +650,31 @@ DEFINE_CAPMIX_NOSRC(3);
 static void alc_inv_dmic_sync(struct hda_codec *codec, bool force)
 {
        struct alc_spec *spec = codec->spec;
-       int i;
+       int src, nums;
 
        if (!spec->inv_dmic_fixup)
                return;
        if (!spec->inv_dmic_muted && !force)
                return;
-       for (i = 0; i < spec->num_adc_nids; i++) {
-               int src = spec->dyn_adc_switch ? 0 : i;
+       nums = spec->gen.dyn_adc_switch ? 1 : spec->gen.num_adc_nids;
+       for (src = 0; src < nums; src++) {
                bool dmic_fixup = false;
-               hda_nid_t nid;
-               int parm, dir, v;
 
                if (spec->inv_dmic_muted &&
-                   spec->imux_pins[spec->cur_mux[src]] == spec->inv_dmic_pin)
+                   spec->gen.imux_pins[spec->gen.cur_mux[src]] == spec->inv_dmic_pin)
                        dmic_fixup = true;
                if (!dmic_fixup && !force)
                        continue;
-               if (spec->vol_in_capsrc) {
-                       nid = spec->capsrc_nids[i];
-                       parm = AC_AMP_SET_RIGHT | AC_AMP_SET_OUTPUT;
-                       dir = HDA_OUTPUT;
-               } else {
-                       nid = spec->adc_nids[i];
-                       parm = AC_AMP_SET_RIGHT | AC_AMP_SET_INPUT;
-                       dir = HDA_INPUT;
-               }
-               /* we care only right channel */
-               v = snd_hda_codec_amp_read(codec, nid, 1, dir, 0);
-               if (v & 0x80) /* if already muted, we don't need to touch */
-                       continue;
-               if (dmic_fixup) /* add mute for d-mic */
-                       v |= 0x80;
-               snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
-                                   parm | v);
+               alc_inv_dmic_sync_adc(codec, src);
        }
 }
 
+static void alc_inv_dmic_hook(struct hda_codec *codec,
+                            struct snd_ctl_elem_value *ucontrol)
+{
+       alc_inv_dmic_sync(codec, false);
+}
+
 static int alc_inv_dmic_sw_get(struct snd_kcontrol *kcontrol,
                               struct snd_ctl_elem_value *ucontrol)
 {
@@ -1749,6 +701,7 @@ static int alc_inv_dmic_sw_put(struct snd_kcontrol *kcontrol,
 
 static const struct snd_kcontrol_new alc_inv_dmic_sw = {
        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+       .name = "Inverted Internal Mic Capture Switch",
        .info = snd_ctl_boolean_mono_info,
        .get = alc_inv_dmic_sw_get,
        .put = alc_inv_dmic_sw_put,
@@ -1758,51 +711,23 @@ static int alc_add_inv_dmic_mixer(struct hda_codec *codec, hda_nid_t nid)
 {
        struct alc_spec *spec = codec->spec;
 
-       if (!alc_kcontrol_new(spec, "Inverted Internal Mic Capture Switch",
-                             &alc_inv_dmic_sw))
+       if (!snd_hda_gen_add_kctl(&spec->gen, NULL, &alc_inv_dmic_sw))
                return -ENOMEM;
        spec->inv_dmic_fixup = 1;
        spec->inv_dmic_muted = 0;
        spec->inv_dmic_pin = nid;
+       spec->gen.cap_sync_hook = alc_inv_dmic_hook;
        return 0;
 }
 
 /* typically the digital mic is put at node 0x12 */
 static void alc_fixup_inv_dmic_0x12(struct hda_codec *codec,
-                                   const struct alc_fixup *fix, int action)
+                                   const struct hda_fixup *fix, int action)
 {
-       if (action == ALC_FIXUP_ACT_PROBE)
+       if (action == HDA_FIXUP_ACT_PROBE)
                alc_add_inv_dmic_mixer(codec, 0x12);
 }
 
-/*
- * virtual master controls
- */
-
-/*
- * slave controls for virtual master
- */
-static const char * const alc_slave_pfxs[] = {
-       "Front", "Surround", "Center", "LFE", "Side",
-       "Headphone", "Speaker", "Mono", "Line Out",
-       "CLFE", "Bass Speaker", "PCM",
-       NULL,
-};
-
-/*
- * 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
 /* additional beep mixers; the actual parameters are overwritten at build */
@@ -1813,45 +738,20 @@ static const struct snd_kcontrol_new alc_beep_mixer[] = {
 };
 #endif
 
-static int __alc_build_controls(struct hda_codec *codec)
+static int alc_build_controls(struct hda_codec *codec)
 {
        struct alc_spec *spec = codec->spec;
-       struct snd_kcontrol *kctl = NULL;
-       const struct snd_kcontrol_new *knew;
-       int i, j, err;
-       unsigned int u;
-       hda_nid_t nid;
+       int i, err;
+
+       err = snd_hda_gen_build_controls(codec);
+       if (err < 0)
+               return err;
 
        for (i = 0; i < spec->num_mixers; i++) {
                err = snd_hda_add_new_ctls(codec, spec->mixers[i]);
                if (err < 0)
                        return err;
        }
-       if (spec->cap_mixer) {
-               err = snd_hda_add_new_ctls(codec, spec->cap_mixer);
-               if (err < 0)
-                       return err;
-       }
-       if (spec->multiout.dig_out_nid) {
-               err = snd_hda_create_dig_out_ctls(codec,
-                                                 spec->multiout.dig_out_nid,
-                                                 spec->multiout.dig_out_nid,
-                                                 spec->pcm_rec[1].pcm_type);
-               if (err < 0)
-                       return err;
-               if (!spec->no_analog) {
-                       err = snd_hda_create_spdif_share_sw(codec,
-                                                           &spec->multiout);
-                       if (err < 0)
-                               return err;
-                       spec->multiout.share_spdif = 1;
-               }
-       }
-       if (spec->dig_in_nid) {
-               err = snd_hda_create_spdif_in_ctls(codec, spec->dig_in_nid);
-               if (err < 0)
-                       return err;
-       }
 
 #ifdef CONFIG_SND_HDA_INPUT_BEEP
        /* create beep controls if needed */
@@ -1865,2372 +765,158 @@ static int __alc_build_controls(struct hda_codec *codec)
                        kctl->private_value = spec->beep_amp;
                        err = snd_hda_ctl_add(codec, 0, kctl);
                        if (err < 0)
-                               return err;
-               }
-       }
-#endif
-
-       /* if we have no master control, let's create it */
-       if (!spec->no_analog &&
-           !snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) {
-               unsigned int vmaster_tlv[4];
-               snd_hda_set_vmaster_tlv(codec, spec->vmaster_nid,
-                                       HDA_OUTPUT, vmaster_tlv);
-               err = snd_hda_add_vmaster(codec, "Master Playback Volume",
-                                         vmaster_tlv, alc_slave_pfxs,
-                                         "Playback Volume");
-               if (err < 0)
-                       return err;
-       }
-       if (!spec->no_analog &&
-           !snd_hda_find_mixer_ctl(codec, "Master Playback Switch")) {
-               err = __snd_hda_add_vmaster(codec, "Master Playback Switch",
-                                           NULL, alc_slave_pfxs,
-                                           "Playback Switch",
-                                           true, &spec->vmaster_mute.sw_kctl);
-               if (err < 0)
-                       return err;
-       }
-
-       /* assign Capture Source enums to NID */
-       if (spec->capsrc_nids || spec->adc_nids) {
-               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_nid(codec, kctl, i,
-                                             get_capsrc(spec, i));
-                       if (err < 0)
-                               return err;
-               }
-       }
-       if (spec->cap_mixer && spec->adc_nids) {
-               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;
-                       }
-               }
-       }
-
-       alc_free_kctls(codec); /* no longer needed */
-
-       return 0;
-}
-
-static int alc_build_jacks(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
-
-       if (spec->shared_mic_hp) {
-               int err;
-               int nid = spec->autocfg.inputs[1].pin;
-               err = snd_hda_jack_add_kctl(codec, nid, "Headphone Mic", 0);
-               if (err < 0)
-                       return err;
-               err = snd_hda_jack_detect_enable(codec, nid, 0);
-               if (err < 0)
-                       return err;
-       }
-
-       return snd_hda_jack_add_kctls(codec, &spec->autocfg);
-}
-
-static int alc_build_controls(struct hda_codec *codec)
-{
-       int err = __alc_build_controls(codec);
-       if (err < 0)
-               return err;
-
-       err = alc_build_jacks(codec);
-       if (err < 0)
-               return err;
-       alc_apply_fixup(codec, ALC_FIXUP_ACT_BUILD);
-       return 0;
-}
-
-
-/*
- * Common callbacks
- */
-
-static void alc_init_special_input_src(struct hda_codec *codec);
-static void alc_auto_init_std(struct hda_codec *codec);
-
-static int alc_init(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
-
-       if (spec->init_hook)
-               spec->init_hook(codec);
-
-       alc_fix_pll(codec);
-       alc_auto_init_amp(codec, spec->init_amp);
-
-       snd_hda_gen_apply_verbs(codec);
-       alc_init_special_input_src(codec);
-       alc_auto_init_std(codec);
-
-       alc_apply_fixup(codec, ALC_FIXUP_ACT_INIT);
-
-       hda_call_check_power_status(codec, 0x01);
-       return 0;
-}
-
-#ifdef CONFIG_PM
-static int alc_check_power_status(struct hda_codec *codec, hda_nid_t nid)
-{
-       struct alc_spec *spec = codec->spec;
-       return snd_hda_check_amp_list_power(codec, &spec->loopback, nid);
-}
-#endif
-
-/*
- * Analog playback callbacks
- */
-static int alc_playback_pcm_open(struct hda_pcm_stream *hinfo,
-                                   struct hda_codec *codec,
-                                   struct snd_pcm_substream *substream)
-{
-       struct alc_spec *spec = codec->spec;
-       return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream,
-                                            hinfo);
-}
-
-static int alc_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
-                                      struct hda_codec *codec,
-                                      unsigned int stream_tag,
-                                      unsigned int format,
-                                      struct snd_pcm_substream *substream)
-{
-       struct alc_spec *spec = codec->spec;
-       return snd_hda_multi_out_analog_prepare(codec, &spec->multiout,
-                                               stream_tag, format, substream);
-}
-
-static int alc_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
-                                      struct hda_codec *codec,
-                                      struct snd_pcm_substream *substream)
-{
-       struct alc_spec *spec = codec->spec;
-       return snd_hda_multi_out_analog_cleanup(codec, &spec->multiout);
-}
-
-/*
- * Digital out
- */
-static int alc_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,
-                                       struct hda_codec *codec,
-                                       struct snd_pcm_substream *substream)
-{
-       struct alc_spec *spec = codec->spec;
-       return snd_hda_multi_out_dig_open(codec, &spec->multiout);
-}
-
-static int alc_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
-                                          struct hda_codec *codec,
-                                          unsigned int stream_tag,
-                                          unsigned int format,
-                                          struct snd_pcm_substream *substream)
-{
-       struct alc_spec *spec = codec->spec;
-       return snd_hda_multi_out_dig_prepare(codec, &spec->multiout,
-                                            stream_tag, format, substream);
-}
-
-static int alc_dig_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
-                                          struct hda_codec *codec,
-                                          struct snd_pcm_substream *substream)
-{
-       struct alc_spec *spec = codec->spec;
-       return snd_hda_multi_out_dig_cleanup(codec, &spec->multiout);
-}
-
-static int alc_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,
-                                        struct hda_codec *codec,
-                                        struct snd_pcm_substream *substream)
-{
-       struct alc_spec *spec = codec->spec;
-       return snd_hda_multi_out_dig_close(codec, &spec->multiout);
-}
-
-/*
- * Analog capture
- */
-static int alc_alt_capture_pcm_prepare(struct hda_pcm_stream *hinfo,
-                                     struct hda_codec *codec,
-                                     unsigned int stream_tag,
-                                     unsigned int format,
-                                     struct snd_pcm_substream *substream)
-{
-       struct alc_spec *spec = codec->spec;
-
-       snd_hda_codec_setup_stream(codec, spec->adc_nids[substream->number + 1],
-                                  stream_tag, 0, format);
-       return 0;
-}
-
-static int alc_alt_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
-                                     struct hda_codec *codec,
-                                     struct snd_pcm_substream *substream)
-{
-       struct alc_spec *spec = codec->spec;
-
-       snd_hda_codec_cleanup_stream(codec,
-                                    spec->adc_nids[substream->number + 1]);
-       return 0;
-}
-
-/* analog capture with dynamic dual-adc changes */
-static int dyn_adc_capture_pcm_prepare(struct hda_pcm_stream *hinfo,
-                                      struct hda_codec *codec,
-                                      unsigned int stream_tag,
-                                      unsigned int format,
-                                      struct snd_pcm_substream *substream)
-{
-       struct alc_spec *spec = codec->spec;
-       spec->cur_adc = spec->adc_nids[spec->dyn_adc_idx[spec->cur_mux[0]]];
-       spec->cur_adc_stream_tag = stream_tag;
-       spec->cur_adc_format = format;
-       snd_hda_codec_setup_stream(codec, spec->cur_adc, stream_tag, 0, format);
-       return 0;
-}
-
-static int dyn_adc_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
-                                      struct hda_codec *codec,
-                                      struct snd_pcm_substream *substream)
-{
-       struct alc_spec *spec = codec->spec;
-       snd_hda_codec_cleanup_stream(codec, spec->cur_adc);
-       spec->cur_adc = 0;
-       return 0;
-}
-
-static const struct hda_pcm_stream dyn_adc_pcm_analog_capture = {
-       .substreams = 1,
-       .channels_min = 2,
-       .channels_max = 2,
-       .nid = 0, /* fill later */
-       .ops = {
-               .prepare = dyn_adc_capture_pcm_prepare,
-               .cleanup = dyn_adc_capture_pcm_cleanup
-       },
-};
-
-/*
- */
-static const struct hda_pcm_stream alc_pcm_analog_playback = {
-       .substreams = 1,
-       .channels_min = 2,
-       .channels_max = 8,
-       /* NID is set in alc_build_pcms */
-       .ops = {
-               .open = alc_playback_pcm_open,
-               .prepare = alc_playback_pcm_prepare,
-               .cleanup = alc_playback_pcm_cleanup
-       },
-};
-
-static const struct hda_pcm_stream alc_pcm_analog_capture = {
-       .substreams = 1,
-       .channels_min = 2,
-       .channels_max = 2,
-       /* NID is set in alc_build_pcms */
-};
-
-static const struct hda_pcm_stream alc_pcm_analog_alt_playback = {
-       .substreams = 1,
-       .channels_min = 2,
-       .channels_max = 2,
-       /* NID is set in alc_build_pcms */
-};
-
-static const struct hda_pcm_stream alc_pcm_analog_alt_capture = {
-       .substreams = 2, /* can be overridden */
-       .channels_min = 2,
-       .channels_max = 2,
-       /* NID is set in alc_build_pcms */
-       .ops = {
-               .prepare = alc_alt_capture_pcm_prepare,
-               .cleanup = alc_alt_capture_pcm_cleanup
-       },
-};
-
-static const struct hda_pcm_stream alc_pcm_digital_playback = {
-       .substreams = 1,
-       .channels_min = 2,
-       .channels_max = 2,
-       /* NID is set in alc_build_pcms */
-       .ops = {
-               .open = alc_dig_playback_pcm_open,
-               .close = alc_dig_playback_pcm_close,
-               .prepare = alc_dig_playback_pcm_prepare,
-               .cleanup = alc_dig_playback_pcm_cleanup
-       },
-};
-
-static const struct hda_pcm_stream alc_pcm_digital_capture = {
-       .substreams = 1,
-       .channels_min = 2,
-       .channels_max = 2,
-       /* NID is set in alc_build_pcms */
-};
-
-/* Used by alc_build_pcms to flag that a PCM has no playback stream */
-static const struct hda_pcm_stream alc_pcm_null_stream = {
-       .substreams = 0,
-       .channels_min = 0,
-       .channels_max = 0,
-};
-
-static int alc_build_pcms(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
-       struct hda_pcm *info = spec->pcm_rec;
-       const struct hda_pcm_stream *p;
-       bool have_multi_adcs;
-       int i;
-
-       codec->num_pcms = 1;
-       codec->pcm_info = info;
-
-       if (spec->no_analog)
-               goto skip_analog;
-
-       snprintf(spec->stream_name_analog, sizeof(spec->stream_name_analog),
-                "%s Analog", codec->chip_name);
-       info->name = spec->stream_name_analog;
-
-       if (spec->multiout.num_dacs > 0) {
-               p = spec->stream_analog_playback;
-               if (!p)
-                       p = &alc_pcm_analog_playback;
-               info->stream[SNDRV_PCM_STREAM_PLAYBACK] = *p;
-               info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dac_nids[0];
-               info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max =
-                       spec->multiout.max_channels;
-               if (spec->autocfg.line_out_type == AUTO_PIN_SPEAKER_OUT &&
-                   spec->autocfg.line_outs == 2)
-                       info->stream[SNDRV_PCM_STREAM_PLAYBACK].chmap =
-                               snd_pcm_2_1_chmaps;
-       }
-       if (spec->adc_nids) {
-               p = spec->stream_analog_capture;
-               if (!p) {
-                       if (spec->dyn_adc_switch)
-                               p = &dyn_adc_pcm_analog_capture;
-                       else
-                               p = &alc_pcm_analog_capture;
-               }
-               info->stream[SNDRV_PCM_STREAM_CAPTURE] = *p;
-               info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nids[0];
-       }
-
-       if (spec->channel_mode) {
-               info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = 0;
-               for (i = 0; i < spec->num_channel_mode; i++) {
-                       if (spec->channel_mode[i].channels > info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max) {
-                               info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = spec->channel_mode[i].channels;
-                       }
-               }
-       }
-
- skip_analog:
-       /* SPDIF for stream index #1 */
-       if (spec->multiout.dig_out_nid || spec->dig_in_nid) {
-               snprintf(spec->stream_name_digital,
-                        sizeof(spec->stream_name_digital),
-                        "%s Digital", codec->chip_name);
-               codec->num_pcms = 2;
-               codec->slave_dig_outs = spec->multiout.slave_dig_outs;
-               info = spec->pcm_rec + 1;
-               info->name = spec->stream_name_digital;
-               if (spec->dig_out_type)
-                       info->pcm_type = spec->dig_out_type;
-               else
-                       info->pcm_type = HDA_PCM_TYPE_SPDIF;
-               if (spec->multiout.dig_out_nid) {
-                       p = spec->stream_digital_playback;
-                       if (!p)
-                               p = &alc_pcm_digital_playback;
-                       info->stream[SNDRV_PCM_STREAM_PLAYBACK] = *p;
-                       info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dig_out_nid;
-               }
-               if (spec->dig_in_nid) {
-                       p = spec->stream_digital_capture;
-                       if (!p)
-                               p = &alc_pcm_digital_capture;
-                       info->stream[SNDRV_PCM_STREAM_CAPTURE] = *p;
-                       info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->dig_in_nid;
-               }
-               /* FIXME: do we need this for all Realtek codec models? */
-               codec->spdif_status_reset = 1;
-       }
-
-       if (spec->no_analog)
-               return 0;
-
-       /* If the use of more than one ADC is requested for the current
-        * model, configure a second analog capture-only PCM.
-        */
-       have_multi_adcs = (spec->num_adc_nids > 1) &&
-               !spec->dyn_adc_switch && !spec->auto_mic &&
-               (!spec->input_mux || spec->input_mux->num_items > 1);
-       /* Additional Analaog capture for index #2 */
-       if (spec->alt_dac_nid || have_multi_adcs) {
-               codec->num_pcms = 3;
-               info = spec->pcm_rec + 2;
-               info->name = spec->stream_name_analog;
-               if (spec->alt_dac_nid) {
-                       p = spec->stream_analog_alt_playback;
-                       if (!p)
-                               p = &alc_pcm_analog_alt_playback;
-                       info->stream[SNDRV_PCM_STREAM_PLAYBACK] = *p;
-                       info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid =
-                               spec->alt_dac_nid;
-               } else {
-                       info->stream[SNDRV_PCM_STREAM_PLAYBACK] =
-                               alc_pcm_null_stream;
-                       info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = 0;
-               }
-               if (have_multi_adcs) {
-                       p = spec->stream_analog_alt_capture;
-                       if (!p)
-                               p = &alc_pcm_analog_alt_capture;
-                       info->stream[SNDRV_PCM_STREAM_CAPTURE] = *p;
-                       info->stream[SNDRV_PCM_STREAM_CAPTURE].nid =
-                               spec->adc_nids[1];
-                       info->stream[SNDRV_PCM_STREAM_CAPTURE].substreams =
-                               spec->num_adc_nids - 1;
-               } else {
-                       info->stream[SNDRV_PCM_STREAM_CAPTURE] =
-                               alc_pcm_null_stream;
-                       info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = 0;
-               }
-       }
-
-       return 0;
-}
-
-static inline void alc_shutup(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
-
-       if (spec && spec->shutup)
-               spec->shutup(codec);
-       snd_hda_shutup_pins(codec);
-}
-
-static void alc_free_kctls(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
-
-       if (spec->kctls.list) {
-               struct snd_kcontrol_new *kctl = spec->kctls.list;
-               int i;
-               for (i = 0; i < spec->kctls.used; i++)
-                       kfree(kctl[i].name);
-       }
-       snd_array_free(&spec->kctls);
-}
-
-static void alc_free_bind_ctls(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
-       if (spec->bind_ctls.list) {
-               struct hda_bind_ctls **ctl = spec->bind_ctls.list;
-               int i;
-               for (i = 0; i < spec->bind_ctls.used; i++)
-                       kfree(ctl[i]);
-       }
-       snd_array_free(&spec->bind_ctls);
-}
-
-static void alc_free(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
-
-       if (!spec)
-               return;
-
-       alc_free_kctls(codec);
-       alc_free_bind_ctls(codec);
-       snd_hda_gen_free(&spec->gen);
-       kfree(spec);
-       snd_hda_detach_beep_device(codec);
-}
-
-#ifdef CONFIG_PM
-static void alc_power_eapd(struct hda_codec *codec)
-{
-       alc_auto_setup_eapd(codec, false);
-}
-
-static int alc_suspend(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
-       alc_shutup(codec);
-       if (spec && spec->power_hook)
-               spec->power_hook(codec);
-       return 0;
-}
-#endif
-
-#ifdef CONFIG_PM
-static int alc_resume(struct hda_codec *codec)
-{
-       msleep(150); /* to avoid pop noise */
-       codec->patch_ops.init(codec);
-       snd_hda_codec_resume_amp(codec);
-       snd_hda_codec_resume_cache(codec);
-       alc_inv_dmic_sync(codec, true);
-       hda_call_check_power_status(codec, 0x01);
-       return 0;
-}
-#endif
-
-/*
- */
-static const struct hda_codec_ops alc_patch_ops = {
-       .build_controls = alc_build_controls,
-       .build_pcms = alc_build_pcms,
-       .init = alc_init,
-       .free = alc_free,
-       .unsol_event = snd_hda_jack_unsol_event,
-#ifdef CONFIG_PM
-       .resume = alc_resume,
-#endif
-#ifdef CONFIG_PM
-       .suspend = alc_suspend,
-       .check_power_status = alc_check_power_status,
-#endif
-       .reboot_notify = alc_shutup,
-};
-
-
-/* replace the codec chip_name with the given string */
-static int alc_codec_rename(struct hda_codec *codec, const char *name)
-{
-       kfree(codec->chip_name);
-       codec->chip_name = kstrdup(name, GFP_KERNEL);
-       if (!codec->chip_name) {
-               alc_free(codec);
-               return -ENOMEM;
-       }
-       return 0;
-}
-
-/*
- * Rename codecs appropriately from COEF value
- */
-struct alc_codec_rename_table {
-       unsigned int vendor_id;
-       unsigned short coef_mask;
-       unsigned short coef_bits;
-       const char *name;
-};
-
-static struct alc_codec_rename_table rename_tbl[] = {
-       { 0x10ec0269, 0xfff0, 0x3010, "ALC277" },
-       { 0x10ec0269, 0xf0f0, 0x2010, "ALC259" },
-       { 0x10ec0269, 0xf0f0, 0x3010, "ALC258" },
-       { 0x10ec0269, 0x00f0, 0x0010, "ALC269VB" },
-       { 0x10ec0269, 0xffff, 0xa023, "ALC259" },
-       { 0x10ec0269, 0xffff, 0x6023, "ALC281X" },
-       { 0x10ec0269, 0x00f0, 0x0020, "ALC269VC" },
-       { 0x10ec0269, 0x00f0, 0x0030, "ALC269VD" },
-       { 0x10ec0887, 0x00f0, 0x0030, "ALC887-VD" },
-       { 0x10ec0888, 0x00f0, 0x0030, "ALC888-VD" },
-       { 0x10ec0888, 0xf0f0, 0x3020, "ALC886" },
-       { 0x10ec0899, 0x2000, 0x2000, "ALC899" },
-       { 0x10ec0892, 0xffff, 0x8020, "ALC661" },
-       { 0x10ec0892, 0xffff, 0x8011, "ALC661" },
-       { 0x10ec0892, 0xffff, 0x4011, "ALC656" },
-       { } /* terminator */
-};
-
-static int alc_codec_rename_from_preset(struct hda_codec *codec)
-{
-       const struct alc_codec_rename_table *p;
-
-       for (p = rename_tbl; p->vendor_id; p++) {
-               if (p->vendor_id != codec->vendor_id)
-                       continue;
-               if ((alc_get_coef0(codec) & p->coef_mask) == p->coef_bits)
-                       return alc_codec_rename(codec, p->name);
-       }
-       return 0;
-}
-
-/*
- * Automatic parse of I/O pins from the BIOS configuration
- */
-
-enum {
-       ALC_CTL_WIDGET_VOL,
-       ALC_CTL_WIDGET_MUTE,
-       ALC_CTL_BIND_MUTE,
-       ALC_CTL_BIND_VOL,
-       ALC_CTL_BIND_SW,
-};
-static const struct snd_kcontrol_new alc_control_templates[] = {
-       HDA_CODEC_VOLUME(NULL, 0, 0, 0),
-       HDA_CODEC_MUTE(NULL, 0, 0, 0),
-       HDA_BIND_MUTE(NULL, 0, 0, 0),
-       HDA_BIND_VOL(NULL, 0),
-       HDA_BIND_SW(NULL, 0),
-};
-
-/* add dynamic controls */
-static int add_control(struct alc_spec *spec, int type, const char *name,
-                      int cidx, unsigned long val)
-{
-       struct snd_kcontrol_new *knew;
-
-       knew = alc_kcontrol_new(spec, name, &alc_control_templates[type]);
-       if (!knew)
-               return -ENOMEM;
-       knew->index = cidx;
-       if (get_amp_nid_(val))
-               knew->subdevice = HDA_SUBDEV_AMP_FLAG;
-       knew->private_value = val;
-       return 0;
-}
-
-static int add_control_with_pfx(struct alc_spec *spec, int type,
-                               const char *pfx, const char *dir,
-                               const char *sfx, int cidx, unsigned long val)
-{
-       char name[32];
-       snprintf(name, sizeof(name), "%s %s %s", pfx, dir, sfx);
-       return add_control(spec, type, name, cidx, val);
-}
-
-#define add_pb_vol_ctrl(spec, type, pfx, val)                  \
-       add_control_with_pfx(spec, type, pfx, "Playback", "Volume", 0, val)
-#define add_pb_sw_ctrl(spec, type, pfx, val)                   \
-       add_control_with_pfx(spec, type, pfx, "Playback", "Switch", 0, val)
-#define __add_pb_vol_ctrl(spec, type, pfx, cidx, val)                  \
-       add_control_with_pfx(spec, type, pfx, "Playback", "Volume", cidx, val)
-#define __add_pb_sw_ctrl(spec, type, pfx, cidx, val)                   \
-       add_control_with_pfx(spec, type, pfx, "Playback", "Switch", cidx, val)
-
-static const char * const channel_name[4] = {
-       "Front", "Surround", "CLFE", "Side"
-};
-
-static const char *alc_get_line_out_pfx(struct alc_spec *spec, int ch,
-                                       bool can_be_master, int *index)
-{
-       struct auto_pin_cfg *cfg = &spec->autocfg;
-
-       *index = 0;
-       if (cfg->line_outs == 1 && !spec->multi_ios &&
-           !cfg->hp_outs && !cfg->speaker_outs && can_be_master)
-               return "Master";
-
-       switch (cfg->line_out_type) {
-       case AUTO_PIN_SPEAKER_OUT:
-               if (cfg->line_outs == 1)
-                       return "Speaker";
-               if (cfg->line_outs == 2)
-                       return ch ? "Bass Speaker" : "Speaker";
-               break;
-       case AUTO_PIN_HP_OUT:
-               /* for multi-io case, only the primary out */
-               if (ch && spec->multi_ios)
-                       break;
-               *index = ch;
-               return "Headphone";
-       default:
-               if (cfg->line_outs == 1 && !spec->multi_ios)
-                       return "PCM";
-               break;
-       }
-       if (ch >= ARRAY_SIZE(channel_name)) {
-               snd_BUG();
-               return "PCM";
-       }
-
-       return channel_name[ch];
-}
-
-#ifdef CONFIG_PM
-/* add the powersave loopback-list entry */
-static void add_loopback_list(struct alc_spec *spec, hda_nid_t mix, int idx)
-{
-       struct hda_amp_list *list;
-
-       if (spec->num_loopbacks >= ARRAY_SIZE(spec->loopback_list) - 1)
-               return;
-       list = spec->loopback_list + spec->num_loopbacks;
-       list->nid = mix;
-       list->dir = HDA_INPUT;
-       list->idx = idx;
-       spec->num_loopbacks++;
-       spec->loopback.amplist = spec->loopback_list;
-}
-#else
-#define add_loopback_list(spec, mix, idx) /* NOP */
-#endif
-
-/* create input playback/capture controls for the given pin */
-static int new_analog_input(struct alc_spec *spec, hda_nid_t pin,
-                           const char *ctlname, int ctlidx,
-                           int idx, hda_nid_t mix_nid)
-{
-       int err;
-
-       err = __add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, ctlname, ctlidx,
-                         HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT));
-       if (err < 0)
-               return err;
-       err = __add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, ctlname, ctlidx,
-                         HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT));
-       if (err < 0)
-               return err;
-       add_loopback_list(spec, mix_nid, idx);
-       return 0;
-}
-
-static int alc_is_input_pin(struct hda_codec *codec, hda_nid_t nid)
-{
-       unsigned int pincap = snd_hda_query_pin_caps(codec, nid);
-       return (pincap & AC_PINCAP_IN) != 0;
-}
-
-/* Parse the codec tree and retrieve ADCs and corresponding capsrc MUXs */
-static int alc_auto_fill_adc_caps(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
-       hda_nid_t nid;
-       hda_nid_t *adc_nids = spec->private_adc_nids;
-       hda_nid_t *cap_nids = spec->private_capsrc_nids;
-       int max_nums = ARRAY_SIZE(spec->private_adc_nids);
-       int i, nums = 0;
-
-       nid = codec->start_nid;
-       for (i = 0; i < codec->num_nodes; i++, nid++) {
-               hda_nid_t src;
-               unsigned int caps = get_wcaps(codec, nid);
-               int type = get_wcaps_type(caps);
-
-               if (type != AC_WID_AUD_IN || (caps & AC_WCAP_DIGITAL))
-                       continue;
-               adc_nids[nums] = nid;
-               cap_nids[nums] = nid;
-               src = nid;
-               for (;;) {
-                       int n;
-                       type = get_wcaps_type(get_wcaps(codec, src));
-                       if (type == AC_WID_PIN)
-                               break;
-                       if (type == AC_WID_AUD_SEL) {
-                               cap_nids[nums] = src;
-                               break;
-                       }
-                       n = snd_hda_get_num_conns(codec, src);
-                       if (n > 1) {
-                               cap_nids[nums] = src;
-                               break;
-                       } else if (n != 1)
-                               break;
-                       if (snd_hda_get_connections(codec, src, &src, 1) != 1)
-                               break;
-               }
-               if (++nums >= max_nums)
-                       break;
-       }
-       spec->adc_nids = spec->private_adc_nids;
-       spec->capsrc_nids = spec->private_capsrc_nids;
-       spec->num_adc_nids = nums;
-       return nums;
-}
-
-/* create playback/capture controls for input pins */
-static int alc_auto_create_input_ctls(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
-       const struct auto_pin_cfg *cfg = &spec->autocfg;
-       hda_nid_t mixer = spec->mixer_nid;
-       struct hda_input_mux *imux = &spec->private_imux[0];
-       int num_adcs;
-       int i, c, err, idx, type_idx = 0;
-       const char *prev_label = NULL;
-
-       num_adcs = alc_auto_fill_adc_caps(codec);
-       if (num_adcs < 0)
-               return 0;
-
-       for (i = 0; i < cfg->num_inputs; i++) {
-               hda_nid_t pin;
-               const char *label;
-
-               pin = cfg->inputs[i].pin;
-               if (!alc_is_input_pin(codec, pin))
-                       continue;
-
-               label = hda_get_autocfg_input_label(codec, cfg, i);
-               if (spec->shared_mic_hp && !strcmp(label, "Misc"))
-                       label = "Headphone Mic";
-               if (prev_label && !strcmp(label, prev_label))
-                       type_idx++;
-               else
-                       type_idx = 0;
-               prev_label = label;
-
-               if (mixer) {
-                       idx = get_connection_index(codec, mixer, pin);
-                       if (idx >= 0) {
-                               err = new_analog_input(spec, pin,
-                                                      label, type_idx,
-                                                      idx, mixer);
-                               if (err < 0)
-                                       return err;
-                       }
-               }
-
-               for (c = 0; c < num_adcs; c++) {
-                       hda_nid_t cap = get_capsrc(spec, c);
-                       idx = get_connection_index(codec, cap, pin);
-                       if (idx >= 0) {
-                               spec->imux_pins[imux->num_items] = pin;
-                               snd_hda_add_imux_item(imux, label, idx, NULL);
-                               break;
-                       }
-               }
-       }
-
-       spec->num_mux_defs = 1;
-       spec->input_mux = imux;
-
-       return 0;
-}
-
-/* create a shared input with the headphone out */
-static int alc_auto_create_shared_input(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
-       struct auto_pin_cfg *cfg = &spec->autocfg;
-       unsigned int defcfg;
-       hda_nid_t nid;
-
-       /* only one internal input pin? */
-       if (cfg->num_inputs != 1)
-               return 0;
-       defcfg = snd_hda_codec_get_pincfg(codec, cfg->inputs[0].pin);
-       if (snd_hda_get_input_pin_attr(defcfg) != INPUT_PIN_ATTR_INT)
-               return 0;
-
-       if (cfg->hp_outs == 1 && cfg->line_out_type == AUTO_PIN_SPEAKER_OUT)
-               nid = cfg->hp_pins[0]; /* OK, we have a single HP-out */
-       else if (cfg->line_outs == 1 && cfg->line_out_type == AUTO_PIN_HP_OUT)
-               nid = cfg->line_out_pins[0]; /* OK, we have a single line-out */
-       else
-               return 0; /* both not available */
-
-       if (!(snd_hda_query_pin_caps(codec, nid) & AC_PINCAP_IN))
-               return 0; /* no input */
-
-       cfg->inputs[1].pin = nid;
-       cfg->inputs[1].type = AUTO_PIN_MIC;
-       cfg->num_inputs = 2;
-       spec->shared_mic_hp = 1;
-       snd_printdd("realtek: Enable shared I/O jack on NID 0x%x\n", nid);
-       return 0;
-}
-
-static void alc_set_pin_output(struct hda_codec *codec, hda_nid_t nid,
-                              unsigned int pin_type)
-{
-       snd_hda_set_pin_ctl(codec, nid, pin_type);
-       /* unmute pin */
-       if (nid_has_mute(codec, nid, HDA_OUTPUT))
-               snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
-                           AMP_OUT_UNMUTE);
-}
-
-static int get_pin_type(int line_out_type)
-{
-       if (line_out_type == AUTO_PIN_HP_OUT)
-               return PIN_HP;
-       else
-               return PIN_OUT;
-}
-
-static void alc_auto_init_analog_input(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
-       struct auto_pin_cfg *cfg = &spec->autocfg;
-       int i;
-
-       for (i = 0; i < cfg->num_inputs; i++) {
-               hda_nid_t nid = cfg->inputs[i].pin;
-               if (alc_is_input_pin(codec, nid)) {
-                       alc_set_input_pin(codec, nid, cfg->inputs[i].type);
-                       if (get_wcaps(codec, nid) & AC_WCAP_OUT_AMP)
-                               snd_hda_codec_write(codec, nid, 0,
-                                                   AC_VERB_SET_AMP_GAIN_MUTE,
-                                                   AMP_OUT_MUTE);
-               }
-       }
-
-       /* mute all loopback inputs */
-       if (spec->mixer_nid) {
-               int nums = snd_hda_get_num_conns(codec, spec->mixer_nid);
-               for (i = 0; i < nums; i++)
-                       snd_hda_codec_write(codec, spec->mixer_nid, 0,
-                                           AC_VERB_SET_AMP_GAIN_MUTE,
-                                           AMP_IN_MUTE(i));
-       }
-}
-
-/* convert from MIX nid to DAC */
-static hda_nid_t alc_auto_mix_to_dac(struct hda_codec *codec, hda_nid_t nid)
-{
-       hda_nid_t list[5];
-       int i, num;
-
-       if (get_wcaps_type(get_wcaps(codec, nid)) == AC_WID_AUD_OUT)
-               return nid;
-       num = snd_hda_get_connections(codec, nid, list, ARRAY_SIZE(list));
-       for (i = 0; i < num; i++) {
-               if (get_wcaps_type(get_wcaps(codec, list[i])) == AC_WID_AUD_OUT)
-                       return list[i];
-       }
-       return 0;
-}
-
-/* go down to the selector widget before the mixer */
-static hda_nid_t alc_go_down_to_selector(struct hda_codec *codec, hda_nid_t pin)
-{
-       hda_nid_t srcs[5];
-       int num = snd_hda_get_connections(codec, pin, srcs,
-                                         ARRAY_SIZE(srcs));
-       if (num != 1 ||
-           get_wcaps_type(get_wcaps(codec, srcs[0])) != AC_WID_AUD_SEL)
-               return pin;
-       return srcs[0];
-}
-
-/* get MIX nid connected to the given pin targeted to DAC */
-static hda_nid_t alc_auto_dac_to_mix(struct hda_codec *codec, hda_nid_t pin,
-                                  hda_nid_t dac)
-{
-       hda_nid_t mix[5];
-       int i, num;
-
-       pin = alc_go_down_to_selector(codec, pin);
-       num = snd_hda_get_connections(codec, pin, mix, ARRAY_SIZE(mix));
-       for (i = 0; i < num; i++) {
-               if (alc_auto_mix_to_dac(codec, mix[i]) == dac)
-                       return mix[i];
-       }
-       return 0;
-}
-
-/* select the connection from pin to DAC if needed */
-static int alc_auto_select_dac(struct hda_codec *codec, hda_nid_t pin,
-                              hda_nid_t dac)
-{
-       hda_nid_t mix[5];
-       int i, num;
-
-       pin = alc_go_down_to_selector(codec, pin);
-       num = snd_hda_get_connections(codec, pin, mix, ARRAY_SIZE(mix));
-       if (num < 2)
-               return 0;
-       for (i = 0; i < num; i++) {
-               if (alc_auto_mix_to_dac(codec, mix[i]) == dac) {
-                       snd_hda_codec_update_cache(codec, pin, 0,
-                                                  AC_VERB_SET_CONNECT_SEL, i);
-                       return 0;
-               }
-       }
-       return 0;
-}
-
-static bool alc_is_dac_already_used(struct hda_codec *codec, hda_nid_t nid)
-{
-       struct alc_spec *spec = codec->spec;
-       int i;
-       if (found_in_nid_list(nid, spec->multiout.dac_nids,
-                             ARRAY_SIZE(spec->private_dac_nids)) ||
-           found_in_nid_list(nid, spec->multiout.hp_out_nid,
-                             ARRAY_SIZE(spec->multiout.hp_out_nid)) ||
-           found_in_nid_list(nid, spec->multiout.extra_out_nid,
-                             ARRAY_SIZE(spec->multiout.extra_out_nid)))
-               return true;
-       for (i = 0; i < spec->multi_ios; i++) {
-               if (spec->multi_io[i].dac == nid)
-                       return true;
-       }
-       return false;
-}
-
-/* look for an empty DAC slot */
-static hda_nid_t alc_auto_look_for_dac(struct hda_codec *codec, hda_nid_t pin)
-{
-       hda_nid_t srcs[5];
-       int i, num;
-
-       pin = alc_go_down_to_selector(codec, pin);
-       num = snd_hda_get_connections(codec, pin, srcs, ARRAY_SIZE(srcs));
-       for (i = 0; i < num; i++) {
-               hda_nid_t nid = alc_auto_mix_to_dac(codec, srcs[i]);
-               if (!nid)
-                       continue;
-               if (!alc_is_dac_already_used(codec, nid))
-                       return nid;
-       }
-       return 0;
-}
-
-/* check whether the DAC is reachable from the pin */
-static bool alc_auto_is_dac_reachable(struct hda_codec *codec,
-                                     hda_nid_t pin, hda_nid_t dac)
-{
-       hda_nid_t srcs[5];
-       int i, num;
-
-       if (!pin || !dac)
-               return false;
-       pin = alc_go_down_to_selector(codec, pin);
-       num = snd_hda_get_connections(codec, pin, srcs, ARRAY_SIZE(srcs));
-       for (i = 0; i < num; i++) {
-               hda_nid_t nid = alc_auto_mix_to_dac(codec, srcs[i]);
-               if (nid == dac)
-                       return true;
-       }
-       return false;
-}
-
-static hda_nid_t get_dac_if_single(struct hda_codec *codec, hda_nid_t pin)
-{
-       struct alc_spec *spec = codec->spec;
-       hda_nid_t sel = alc_go_down_to_selector(codec, pin);
-       hda_nid_t nid, nid_found, srcs[5];
-       int i, num = snd_hda_get_connections(codec, sel, srcs,
-                                         ARRAY_SIZE(srcs));
-       if (num == 1)
-               return alc_auto_look_for_dac(codec, pin);
-       nid_found = 0;
-       for (i = 0; i < num; i++) {
-               if (srcs[i] == spec->mixer_nid)
-                       continue;
-               nid = alc_auto_mix_to_dac(codec, srcs[i]);
-               if (nid && !alc_is_dac_already_used(codec, nid)) {
-                       if (nid_found)
-                               return 0;
-                       nid_found = nid;
-               }
-       }
-       return nid_found;
-}
-
-/* mark up volume and mute control NIDs: used during badness parsing and
- * at creating actual controls
- */
-static inline unsigned int get_ctl_pos(unsigned int data)
-{
-       hda_nid_t nid = get_amp_nid_(data);
-       unsigned int dir;
-       if (snd_BUG_ON(nid >= MAX_VOL_NIDS))
-               return 0;
-       dir = get_amp_direction_(data);
-       return (nid << 1) | dir;
-}
-
-#define is_ctl_used(bits, data) \
-       test_bit(get_ctl_pos(data), bits)
-#define mark_ctl_usage(bits, data) \
-       set_bit(get_ctl_pos(data), bits)
-
-static void clear_vol_marks(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
-       memset(spec->vol_ctls, 0, sizeof(spec->vol_ctls));
-       memset(spec->sw_ctls, 0, sizeof(spec->sw_ctls));
-}
-
-/* badness definition */
-enum {
-       /* No primary DAC is found for the main output */
-       BAD_NO_PRIMARY_DAC = 0x10000,
-       /* No DAC is found for the extra output */
-       BAD_NO_DAC = 0x4000,
-       /* No possible multi-ios */
-       BAD_MULTI_IO = 0x103,
-       /* No individual DAC for extra output */
-       BAD_NO_EXTRA_DAC = 0x102,
-       /* No individual DAC for extra surrounds */
-       BAD_NO_EXTRA_SURR_DAC = 0x101,
-       /* Primary DAC shared with main surrounds */
-       BAD_SHARED_SURROUND = 0x100,
-       /* Primary DAC shared with main CLFE */
-       BAD_SHARED_CLFE = 0x10,
-       /* Primary DAC shared with extra surrounds */
-       BAD_SHARED_EXTRA_SURROUND = 0x10,
-       /* Volume widget is shared */
-       BAD_SHARED_VOL = 0x10,
-};
-
-static hda_nid_t alc_look_for_out_mute_nid(struct hda_codec *codec,
-                                          hda_nid_t pin, hda_nid_t dac);
-static hda_nid_t alc_look_for_out_vol_nid(struct hda_codec *codec,
-                                         hda_nid_t pin, hda_nid_t dac);
-
-static int eval_shared_vol_badness(struct hda_codec *codec, hda_nid_t pin,
-                                  hda_nid_t dac)
-{
-       struct alc_spec *spec = codec->spec;
-       hda_nid_t nid;
-       unsigned int val;
-       int badness = 0;
-
-       nid = alc_look_for_out_vol_nid(codec, pin, dac);
-       if (nid) {
-               val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT);
-               if (is_ctl_used(spec->vol_ctls, nid))
-                       badness += BAD_SHARED_VOL;
-               else
-                       mark_ctl_usage(spec->vol_ctls, val);
-       } else
-               badness += BAD_SHARED_VOL;
-       nid = alc_look_for_out_mute_nid(codec, pin, dac);
-       if (nid) {
-               unsigned int wid_type = get_wcaps_type(get_wcaps(codec, nid));
-               if (wid_type == AC_WID_PIN || wid_type == AC_WID_AUD_OUT)
-                       val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT);
-               else
-                       val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_INPUT);
-               if (is_ctl_used(spec->sw_ctls, val))
-                       badness += BAD_SHARED_VOL;
-               else
-                       mark_ctl_usage(spec->sw_ctls, val);
-       } else
-               badness += BAD_SHARED_VOL;
-       return badness;
-}
-
-struct badness_table {
-       int no_primary_dac;     /* no primary DAC */
-       int no_dac;             /* no secondary DACs */
-       int shared_primary;     /* primary DAC is shared with main output */
-       int shared_surr;        /* secondary DAC shared with main or primary */
-       int shared_clfe;        /* third DAC shared with main or primary */
-       int shared_surr_main;   /* secondary DAC sahred with main/DAC0 */
-};
-
-static struct badness_table main_out_badness = {
-       .no_primary_dac = BAD_NO_PRIMARY_DAC,
-       .no_dac = BAD_NO_DAC,
-       .shared_primary = BAD_NO_PRIMARY_DAC,
-       .shared_surr = BAD_SHARED_SURROUND,
-       .shared_clfe = BAD_SHARED_CLFE,
-       .shared_surr_main = BAD_SHARED_SURROUND,
-};
-
-static struct badness_table extra_out_badness = {
-       .no_primary_dac = BAD_NO_DAC,
-       .no_dac = BAD_NO_DAC,
-       .shared_primary = BAD_NO_EXTRA_DAC,
-       .shared_surr = BAD_SHARED_EXTRA_SURROUND,
-       .shared_clfe = BAD_SHARED_EXTRA_SURROUND,
-       .shared_surr_main = BAD_NO_EXTRA_SURR_DAC,
-};
-
-/* try to assign DACs to pins and return the resultant badness */
-static int alc_auto_fill_dacs(struct hda_codec *codec, int num_outs,
-                             const hda_nid_t *pins, hda_nid_t *dacs,
-                             const struct badness_table *bad)
-{
-       struct alc_spec *spec = codec->spec;
-       struct auto_pin_cfg *cfg = &spec->autocfg;
-       int i, j;
-       int badness = 0;
-       hda_nid_t dac;
-
-       if (!num_outs)
-               return 0;
-
-       for (i = 0; i < num_outs; i++) {
-               hda_nid_t pin = pins[i];
-               if (!dacs[i])
-                       dacs[i] = alc_auto_look_for_dac(codec, pin);
-               if (!dacs[i] && !i) {
-                       for (j = 1; j < num_outs; j++) {
-                               if (alc_auto_is_dac_reachable(codec, pin, dacs[j])) {
-                                       dacs[0] = dacs[j];
-                                       dacs[j] = 0;
-                                       break;
-                               }
-                       }
-               }
-               dac = dacs[i];
-               if (!dac) {
-                       if (alc_auto_is_dac_reachable(codec, pin, dacs[0]))
-                               dac = dacs[0];
-                       else if (cfg->line_outs > i &&
-                                alc_auto_is_dac_reachable(codec, pin,
-                                       spec->private_dac_nids[i]))
-                               dac = spec->private_dac_nids[i];
-                       if (dac) {
-                               if (!i)
-                                       badness += bad->shared_primary;
-                               else if (i == 1)
-                                       badness += bad->shared_surr;
-                               else
-                                       badness += bad->shared_clfe;
-                       } else if (alc_auto_is_dac_reachable(codec, pin,
-                                       spec->private_dac_nids[0])) {
-                               dac = spec->private_dac_nids[0];
-                               badness += bad->shared_surr_main;
-                       } else if (!i)
-                               badness += bad->no_primary_dac;
-                       else
-                               badness += bad->no_dac;
-               }
-               if (dac)
-                       badness += eval_shared_vol_badness(codec, pin, dac);
-       }
-
-       return badness;
-}
-
-static int alc_auto_fill_multi_ios(struct hda_codec *codec,
-                                  hda_nid_t reference_pin,
-                                  bool hardwired, int offset);
-
-static bool alc_map_singles(struct hda_codec *codec, int outs,
-                           const hda_nid_t *pins, hda_nid_t *dacs)
-{
-       int i;
-       bool found = false;
-       for (i = 0; i < outs; i++) {
-               if (dacs[i])
-                       continue;
-               dacs[i] = get_dac_if_single(codec, pins[i]);
-               if (dacs[i])
-                       found = true;
-       }
-       return found;
-}
-
-/* fill in the dac_nids table from the parsed pin configuration */
-static int fill_and_eval_dacs(struct hda_codec *codec,
-                             bool fill_hardwired,
-                             bool fill_mio_first)
-{
-       struct alc_spec *spec = codec->spec;
-       struct auto_pin_cfg *cfg = &spec->autocfg;
-       int i, err, badness;
-
-       /* set num_dacs once to full for alc_auto_look_for_dac() */
-       spec->multiout.num_dacs = cfg->line_outs;
-       spec->multiout.dac_nids = spec->private_dac_nids;
-       memset(spec->private_dac_nids, 0, sizeof(spec->private_dac_nids));
-       memset(spec->multiout.hp_out_nid, 0, sizeof(spec->multiout.hp_out_nid));
-       memset(spec->multiout.extra_out_nid, 0, sizeof(spec->multiout.extra_out_nid));
-       spec->multi_ios = 0;
-       clear_vol_marks(codec);
-       badness = 0;
-
-       /* fill hard-wired DACs first */
-       if (fill_hardwired) {
-               bool mapped;
-               do {
-                       mapped = alc_map_singles(codec, cfg->line_outs,
-                                                cfg->line_out_pins,
-                                                spec->private_dac_nids);
-                       mapped |= alc_map_singles(codec, cfg->hp_outs,
-                                                 cfg->hp_pins,
-                                                 spec->multiout.hp_out_nid);
-                       mapped |= alc_map_singles(codec, cfg->speaker_outs,
-                                                 cfg->speaker_pins,
-                                                 spec->multiout.extra_out_nid);
-                       if (fill_mio_first && cfg->line_outs == 1 &&
-                           cfg->line_out_type != AUTO_PIN_SPEAKER_OUT) {
-                               err = alc_auto_fill_multi_ios(codec, cfg->line_out_pins[0], true, 0);
-                               if (!err)
-                                       mapped = true;
-                       }
-               } while (mapped);
-       }
-
-       badness += alc_auto_fill_dacs(codec, cfg->line_outs, cfg->line_out_pins,
-                                     spec->private_dac_nids,
-                                     &main_out_badness);
-
-       /* re-count num_dacs and squash invalid entries */
-       spec->multiout.num_dacs = 0;
-       for (i = 0; i < cfg->line_outs; i++) {
-               if (spec->private_dac_nids[i])
-                       spec->multiout.num_dacs++;
-               else {
-                       memmove(spec->private_dac_nids + i,
-                               spec->private_dac_nids + i + 1,
-                               sizeof(hda_nid_t) * (cfg->line_outs - i - 1));
-                       spec->private_dac_nids[cfg->line_outs - 1] = 0;
-               }
-       }
-
-       if (fill_mio_first &&
-           cfg->line_outs == 1 && cfg->line_out_type != AUTO_PIN_SPEAKER_OUT) {
-               /* try to fill multi-io first */
-               err = alc_auto_fill_multi_ios(codec, cfg->line_out_pins[0], false, 0);
-               if (err < 0)
-                       return err;
-               /* we don't count badness at this stage yet */
-       }
-
-       if (cfg->line_out_type != AUTO_PIN_HP_OUT) {
-               err = alc_auto_fill_dacs(codec, cfg->hp_outs, cfg->hp_pins,
-                                        spec->multiout.hp_out_nid,
-                                        &extra_out_badness);
-               if (err < 0)
-                       return err;
-               badness += err;
-       }
-       if (cfg->line_out_type != AUTO_PIN_SPEAKER_OUT) {
-               err = alc_auto_fill_dacs(codec, cfg->speaker_outs,
-                                        cfg->speaker_pins,
-                                        spec->multiout.extra_out_nid,
-                                        &extra_out_badness);
-               if (err < 0)
-                       return err;
-               badness += err;
-       }
-       if (cfg->line_outs == 1 && cfg->line_out_type != AUTO_PIN_SPEAKER_OUT) {
-               err = alc_auto_fill_multi_ios(codec, cfg->line_out_pins[0], false, 0);
-               if (err < 0)
-                       return err;
-               badness += err;
-       }
-       if (cfg->hp_outs && cfg->line_out_type == AUTO_PIN_SPEAKER_OUT) {
-               /* try multi-ios with HP + inputs */
-               int offset = 0;
-               if (cfg->line_outs >= 3)
-                       offset = 1;
-               err = alc_auto_fill_multi_ios(codec, cfg->hp_pins[0], false,
-                                             offset);
-               if (err < 0)
-                       return err;
-               badness += err;
-       }
-
-       if (spec->multi_ios == 2) {
-               for (i = 0; i < 2; i++)
-                       spec->private_dac_nids[spec->multiout.num_dacs++] =
-                               spec->multi_io[i].dac;
-               spec->ext_channel_count = 2;
-       } else if (spec->multi_ios) {
-               spec->multi_ios = 0;
-               badness += BAD_MULTI_IO;
-       }
-
-       return badness;
-}
-
-#define DEBUG_BADNESS
-
-#ifdef DEBUG_BADNESS
-#define debug_badness  snd_printdd
-#else
-#define debug_badness(...)
-#endif
-
-static void debug_show_configs(struct alc_spec *spec, struct auto_pin_cfg *cfg)
-{
-       debug_badness("multi_outs = %x/%x/%x/%x : %x/%x/%x/%x\n",
-                     cfg->line_out_pins[0], cfg->line_out_pins[1],
-                     cfg->line_out_pins[2], cfg->line_out_pins[2],
-                     spec->multiout.dac_nids[0],
-                     spec->multiout.dac_nids[1],
-                     spec->multiout.dac_nids[2],
-                     spec->multiout.dac_nids[3]);
-       if (spec->multi_ios > 0)
-               debug_badness("multi_ios(%d) = %x/%x : %x/%x\n",
-                             spec->multi_ios,
-                             spec->multi_io[0].pin, spec->multi_io[1].pin,
-                             spec->multi_io[0].dac, spec->multi_io[1].dac);
-       debug_badness("hp_outs = %x/%x/%x/%x : %x/%x/%x/%x\n",
-                     cfg->hp_pins[0], cfg->hp_pins[1],
-                     cfg->hp_pins[2], cfg->hp_pins[2],
-                     spec->multiout.hp_out_nid[0],
-                     spec->multiout.hp_out_nid[1],
-                     spec->multiout.hp_out_nid[2],
-                     spec->multiout.hp_out_nid[3]);
-       debug_badness("spk_outs = %x/%x/%x/%x : %x/%x/%x/%x\n",
-                     cfg->speaker_pins[0], cfg->speaker_pins[1],
-                     cfg->speaker_pins[2], cfg->speaker_pins[3],
-                     spec->multiout.extra_out_nid[0],
-                     spec->multiout.extra_out_nid[1],
-                     spec->multiout.extra_out_nid[2],
-                     spec->multiout.extra_out_nid[3]);
-}
-
-static int alc_auto_fill_dac_nids(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
-       struct auto_pin_cfg *cfg = &spec->autocfg;
-       struct auto_pin_cfg *best_cfg;
-       int best_badness = INT_MAX;
-       int badness;
-       bool fill_hardwired = true, fill_mio_first = true;
-       bool best_wired = true, best_mio = true;
-       bool hp_spk_swapped = false;
-
-       best_cfg = kmalloc(sizeof(*best_cfg), GFP_KERNEL);
-       if (!best_cfg)
-               return -ENOMEM;
-       *best_cfg = *cfg;
-
-       for (;;) {
-               badness = fill_and_eval_dacs(codec, fill_hardwired,
-                                            fill_mio_first);
-               if (badness < 0) {
-                       kfree(best_cfg);
-                       return badness;
-               }
-               debug_badness("==> lo_type=%d, wired=%d, mio=%d, badness=0x%x\n",
-                             cfg->line_out_type, fill_hardwired, fill_mio_first,
-                             badness);
-               debug_show_configs(spec, cfg);
-               if (badness < best_badness) {
-                       best_badness = badness;
-                       *best_cfg = *cfg;
-                       best_wired = fill_hardwired;
-                       best_mio = fill_mio_first;
-               }
-               if (!badness)
-                       break;
-               fill_mio_first = !fill_mio_first;
-               if (!fill_mio_first)
-                       continue;
-               fill_hardwired = !fill_hardwired;
-               if (!fill_hardwired)
-                       continue;
-               if (hp_spk_swapped)
-                       break;
-               hp_spk_swapped = true;
-               if (cfg->speaker_outs > 0 &&
-                   cfg->line_out_type == AUTO_PIN_HP_OUT) {
-                       cfg->hp_outs = cfg->line_outs;
-                       memcpy(cfg->hp_pins, cfg->line_out_pins,
-                              sizeof(cfg->hp_pins));
-                       cfg->line_outs = cfg->speaker_outs;
-                       memcpy(cfg->line_out_pins, cfg->speaker_pins,
-                              sizeof(cfg->speaker_pins));
-                       cfg->speaker_outs = 0;
-                       memset(cfg->speaker_pins, 0, sizeof(cfg->speaker_pins));
-                       cfg->line_out_type = AUTO_PIN_SPEAKER_OUT;
-                       fill_hardwired = true;
-                       continue;
-               }
-               if (cfg->hp_outs > 0 &&
-                   cfg->line_out_type == AUTO_PIN_SPEAKER_OUT) {
-                       cfg->speaker_outs = cfg->line_outs;
-                       memcpy(cfg->speaker_pins, cfg->line_out_pins,
-                              sizeof(cfg->speaker_pins));
-                       cfg->line_outs = cfg->hp_outs;
-                       memcpy(cfg->line_out_pins, cfg->hp_pins,
-                              sizeof(cfg->hp_pins));
-                       cfg->hp_outs = 0;
-                       memset(cfg->hp_pins, 0, sizeof(cfg->hp_pins));
-                       cfg->line_out_type = AUTO_PIN_HP_OUT;
-                       fill_hardwired = true;
-                       continue;
-               }
-               break;
-       }
-
-       if (badness) {
-               *cfg = *best_cfg;
-               fill_and_eval_dacs(codec, best_wired, best_mio);
-       }
-       debug_badness("==> Best config: lo_type=%d, wired=%d, mio=%d\n",
-                     cfg->line_out_type, best_wired, best_mio);
-       debug_show_configs(spec, cfg);
-
-       if (cfg->line_out_pins[0])
-               spec->vmaster_nid =
-                       alc_look_for_out_vol_nid(codec, cfg->line_out_pins[0],
-                                                spec->multiout.dac_nids[0]);
-
-       /* clear the bitmap flags for creating controls */
-       clear_vol_marks(codec);
-       kfree(best_cfg);
-       return 0;
-}
-
-static int alc_auto_add_vol_ctl(struct hda_codec *codec,
-                             const char *pfx, int cidx,
-                             hda_nid_t nid, unsigned int chs)
-{
-       struct alc_spec *spec = codec->spec;
-       unsigned int val;
-       if (!nid)
-               return 0;
-       val = HDA_COMPOSE_AMP_VAL(nid, chs, 0, HDA_OUTPUT);
-       if (is_ctl_used(spec->vol_ctls, val) && chs != 2) /* exclude LFE */
-               return 0;
-       mark_ctl_usage(spec->vol_ctls, val);
-       return __add_pb_vol_ctrl(codec->spec, ALC_CTL_WIDGET_VOL, pfx, cidx,
-                                val);
-}
-
-static int alc_auto_add_stereo_vol(struct hda_codec *codec,
-                                  const char *pfx, int cidx,
-                                  hda_nid_t nid)
-{
-       int chs = 1;
-       if (get_wcaps(codec, nid) & AC_WCAP_STEREO)
-               chs = 3;
-       return alc_auto_add_vol_ctl(codec, pfx, cidx, nid, chs);
-}
-
-/* create a mute-switch for the given mixer widget;
- * if it has multiple sources (e.g. DAC and loopback), create a bind-mute
- */
-static int alc_auto_add_sw_ctl(struct hda_codec *codec,
-                            const char *pfx, int cidx,
-                            hda_nid_t nid, unsigned int chs)
-{
-       struct alc_spec *spec = codec->spec;
-       int wid_type;
-       int type;
-       unsigned long val;
-       if (!nid)
-               return 0;
-       wid_type = get_wcaps_type(get_wcaps(codec, nid));
-       if (wid_type == AC_WID_PIN || wid_type == AC_WID_AUD_OUT) {
-               type = ALC_CTL_WIDGET_MUTE;
-               val = HDA_COMPOSE_AMP_VAL(nid, chs, 0, HDA_OUTPUT);
-       } else if (snd_hda_get_num_conns(codec, nid) == 1) {
-               type = ALC_CTL_WIDGET_MUTE;
-               val = HDA_COMPOSE_AMP_VAL(nid, chs, 0, HDA_INPUT);
-       } else {
-               type = ALC_CTL_BIND_MUTE;
-               val = HDA_COMPOSE_AMP_VAL(nid, chs, 2, HDA_INPUT);
-       }
-       if (is_ctl_used(spec->sw_ctls, val) && chs != 2) /* exclude LFE */
-               return 0;
-       mark_ctl_usage(spec->sw_ctls, val);
-       return __add_pb_sw_ctrl(codec->spec, type, pfx, cidx, val);
-}
-
-static int alc_auto_add_stereo_sw(struct hda_codec *codec, const char *pfx,
-                                 int cidx, hda_nid_t nid)
-{
-       int chs = 1;
-       if (get_wcaps(codec, nid) & AC_WCAP_STEREO)
-               chs = 3;
-       return alc_auto_add_sw_ctl(codec, pfx, cidx, nid, chs);
-}
-
-static hda_nid_t alc_look_for_out_mute_nid(struct hda_codec *codec,
-                                          hda_nid_t pin, hda_nid_t dac)
-{
-       hda_nid_t mix = alc_auto_dac_to_mix(codec, pin, dac);
-       if (nid_has_mute(codec, pin, HDA_OUTPUT))
-               return pin;
-       else if (mix && nid_has_mute(codec, mix, HDA_INPUT))
-               return mix;
-       else if (nid_has_mute(codec, dac, HDA_OUTPUT))
-               return dac;
-       return 0;
-}
-
-static hda_nid_t alc_look_for_out_vol_nid(struct hda_codec *codec,
-                                         hda_nid_t pin, hda_nid_t dac)
-{
-       hda_nid_t mix = alc_auto_dac_to_mix(codec, pin, dac);
-       if (nid_has_volume(codec, dac, HDA_OUTPUT))
-               return dac;
-       else if (nid_has_volume(codec, mix, HDA_OUTPUT))
-               return mix;
-       else if (nid_has_volume(codec, pin, HDA_OUTPUT))
-               return pin;
-       return 0;
-}
-
-/* add playback controls from the parsed DAC table */
-static int alc_auto_create_multi_out_ctls(struct hda_codec *codec,
-                                            const struct auto_pin_cfg *cfg)
-{
-       struct alc_spec *spec = codec->spec;
-       int i, err, noutputs;
-
-       noutputs = cfg->line_outs;
-       if (spec->multi_ios > 0 && cfg->line_outs < 3)
-               noutputs += spec->multi_ios;
-
-       for (i = 0; i < noutputs; i++) {
-               const char *name;
-               int index;
-               hda_nid_t dac, pin;
-               hda_nid_t sw, vol;
-
-               dac = spec->multiout.dac_nids[i];
-               if (!dac)
-                       continue;
-               if (i >= cfg->line_outs) {
-                       pin = spec->multi_io[i - 1].pin;
-                       index = 0;
-                       name = channel_name[i];
-               } else {
-                       pin = cfg->line_out_pins[i];
-                       name = alc_get_line_out_pfx(spec, i, true, &index);
-               }
-
-               sw = alc_look_for_out_mute_nid(codec, pin, dac);
-               vol = alc_look_for_out_vol_nid(codec, pin, dac);
-               if (!name || !strcmp(name, "CLFE")) {
-                       /* Center/LFE */
-                       err = alc_auto_add_vol_ctl(codec, "Center", 0, vol, 1);
-                       if (err < 0)
-                               return err;
-                       err = alc_auto_add_vol_ctl(codec, "LFE", 0, vol, 2);
-                       if (err < 0)
-                               return err;
-                       err = alc_auto_add_sw_ctl(codec, "Center", 0, sw, 1);
-                       if (err < 0)
-                               return err;
-                       err = alc_auto_add_sw_ctl(codec, "LFE", 0, sw, 2);
-                       if (err < 0)
-                               return err;
-               } else {
-                       err = alc_auto_add_stereo_vol(codec, name, index, vol);
-                       if (err < 0)
-                               return err;
-                       err = alc_auto_add_stereo_sw(codec, name, index, sw);
-                       if (err < 0)
-                               return err;
-               }
-       }
-       return 0;
-}
-
-static int alc_auto_create_extra_out(struct hda_codec *codec, hda_nid_t pin,
-                                    hda_nid_t dac, const char *pfx,
-                                    int cidx)
-{
-       struct alc_spec *spec = codec->spec;
-       hda_nid_t sw, vol;
-       int err;
-
-       if (!dac) {
-               unsigned int val;
-               /* the corresponding DAC is already occupied */
-               if (!(get_wcaps(codec, pin) & AC_WCAP_OUT_AMP))
-                       return 0; /* no way */
-               /* create a switch only */
-               val = HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT);
-               if (is_ctl_used(spec->sw_ctls, val))
-                       return 0; /* already created */
-               mark_ctl_usage(spec->sw_ctls, val);
-               return __add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, pfx, cidx, val);
-       }
-
-       sw = alc_look_for_out_mute_nid(codec, pin, dac);
-       vol = alc_look_for_out_vol_nid(codec, pin, dac);
-       err = alc_auto_add_stereo_vol(codec, pfx, cidx, vol);
-       if (err < 0)
-               return err;
-       err = alc_auto_add_stereo_sw(codec, pfx, cidx, sw);
-       if (err < 0)
-               return err;
-       return 0;
-}
-
-static struct hda_bind_ctls *new_bind_ctl(struct hda_codec *codec,
-                                         unsigned int nums,
-                                         struct hda_ctl_ops *ops)
-{
-       struct alc_spec *spec = codec->spec;
-       struct hda_bind_ctls **ctlp, *ctl;
-       ctlp = snd_array_new(&spec->bind_ctls);
-       if (!ctlp)
-               return NULL;
-       ctl = kzalloc(sizeof(*ctl) + sizeof(long) * (nums + 1), GFP_KERNEL);
-       *ctlp = ctl;
-       if (ctl)
-               ctl->ops = ops;
-       return ctl;
-}
-
-/* add playback controls for speaker and HP outputs */
-static int alc_auto_create_extra_outs(struct hda_codec *codec, int num_pins,
-                                     const hda_nid_t *pins,
-                                     const hda_nid_t *dacs,
-                                     const char *pfx)
-{
-       struct alc_spec *spec = codec->spec;
-       struct hda_bind_ctls *ctl;
-       char name[32];
-       int i, n, err;
-
-       if (!num_pins || !pins[0])
-               return 0;
-
-       if (num_pins == 1) {
-               hda_nid_t dac = *dacs;
-               if (!dac)
-                       dac = spec->multiout.dac_nids[0];
-               return alc_auto_create_extra_out(codec, *pins, dac, pfx, 0);
-       }
-
-       for (i = 0; i < num_pins; i++) {
-               hda_nid_t dac;
-               if (dacs[num_pins - 1])
-                       dac = dacs[i]; /* with individual volumes */
-               else
-                       dac = 0;
-               if (num_pins == 2 && i == 1 && !strcmp(pfx, "Speaker")) {
-                       err = alc_auto_create_extra_out(codec, pins[i], dac,
-                                                       "Bass Speaker", 0);
-               } else if (num_pins >= 3) {
-                       snprintf(name, sizeof(name), "%s %s",
-                                pfx, channel_name[i]);
-                       err = alc_auto_create_extra_out(codec, pins[i], dac,
-                                                       name, 0);
-               } else {
-                       err = alc_auto_create_extra_out(codec, pins[i], dac,
-                                                       pfx, i);
-               }
-               if (err < 0)
-                       return err;
-       }
-       if (dacs[num_pins - 1])
-               return 0;
-
-       /* Let's create a bind-controls for volumes */
-       ctl = new_bind_ctl(codec, num_pins, &snd_hda_bind_vol);
-       if (!ctl)
-               return -ENOMEM;
-       n = 0;
-       for (i = 0; i < num_pins; i++) {
-               hda_nid_t vol;
-               if (!pins[i] || !dacs[i])
-                       continue;
-               vol = alc_look_for_out_vol_nid(codec, pins[i], dacs[i]);
-               if (vol)
-                       ctl->values[n++] =
-                               HDA_COMPOSE_AMP_VAL(vol, 3, 0, HDA_OUTPUT);
-       }
-       if (n) {
-               snprintf(name, sizeof(name), "%s Playback Volume", pfx);
-               err = add_control(spec, ALC_CTL_BIND_VOL, name, 0, (long)ctl);
-               if (err < 0)
-                       return err;
-       }
-       return 0;
-}
-
-static int alc_auto_create_hp_out(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
-       return alc_auto_create_extra_outs(codec, spec->autocfg.hp_outs,
-                                         spec->autocfg.hp_pins,
-                                         spec->multiout.hp_out_nid,
-                                         "Headphone");
-}
-
-static int alc_auto_create_speaker_out(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
-       return alc_auto_create_extra_outs(codec, spec->autocfg.speaker_outs,
-                                         spec->autocfg.speaker_pins,
-                                         spec->multiout.extra_out_nid,
-                                         "Speaker");
-}
-
-static void alc_auto_set_output_and_unmute(struct hda_codec *codec,
-                                             hda_nid_t pin, int pin_type,
-                                             hda_nid_t dac)
-{
-       int i, num;
-       hda_nid_t nid, mix = 0;
-       hda_nid_t srcs[HDA_MAX_CONNECTIONS];
-
-       alc_set_pin_output(codec, pin, pin_type);
-       nid = alc_go_down_to_selector(codec, pin);
-       num = snd_hda_get_connections(codec, nid, srcs, ARRAY_SIZE(srcs));
-       for (i = 0; i < num; i++) {
-               if (alc_auto_mix_to_dac(codec, srcs[i]) != dac)
-                       continue;
-               mix = srcs[i];
-               break;
-       }
-       if (!mix)
-               return;
-
-       /* need the manual connection? */
-       if (num > 1)
-               snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL, i);
-       /* unmute mixer widget inputs */
-       if (nid_has_mute(codec, mix, HDA_INPUT)) {
-               snd_hda_codec_write(codec, mix, 0, AC_VERB_SET_AMP_GAIN_MUTE,
-                           AMP_IN_UNMUTE(0));
-               snd_hda_codec_write(codec, mix, 0, AC_VERB_SET_AMP_GAIN_MUTE,
-                           AMP_IN_UNMUTE(1));
-       }
-       /* initialize volume */
-       nid = alc_look_for_out_vol_nid(codec, pin, dac);
-       if (nid)
-               snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
-                                   AMP_OUT_ZERO);
-
-       /* unmute DAC if it's not assigned to a mixer */
-       nid = alc_look_for_out_mute_nid(codec, pin, dac);
-       if (nid == mix && nid_has_mute(codec, dac, HDA_OUTPUT))
-               snd_hda_codec_write(codec, dac, 0, AC_VERB_SET_AMP_GAIN_MUTE,
-                                   AMP_OUT_ZERO);
-}
-
-static void alc_auto_init_multi_out(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
-       int pin_type = get_pin_type(spec->autocfg.line_out_type);
-       int i;
-
-       for (i = 0; i <= HDA_SIDE; i++) {
-               hda_nid_t nid = spec->autocfg.line_out_pins[i];
-               if (nid)
-                       alc_auto_set_output_and_unmute(codec, nid, pin_type,
-                                       spec->multiout.dac_nids[i]);
-       }
-}
-
-static void alc_auto_init_extra_out(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
-       int i;
-       hda_nid_t pin, dac;
-
-       for (i = 0; i < spec->autocfg.hp_outs; i++) {
-               if (spec->autocfg.line_out_type == AUTO_PIN_HP_OUT)
-                       break;
-               pin = spec->autocfg.hp_pins[i];
-               if (!pin)
-                       break;
-               dac = spec->multiout.hp_out_nid[i];
-               if (!dac) {
-                       if (i > 0 && spec->multiout.hp_out_nid[0])
-                               dac = spec->multiout.hp_out_nid[0];
-                       else
-                               dac = spec->multiout.dac_nids[0];
-               }
-               alc_auto_set_output_and_unmute(codec, pin, PIN_HP, dac);
-       }
-       for (i = 0; i < spec->autocfg.speaker_outs; i++) {
-               if (spec->autocfg.line_out_type == AUTO_PIN_SPEAKER_OUT)
-                       break;
-               pin = spec->autocfg.speaker_pins[i];
-               if (!pin)
-                       break;
-               dac = spec->multiout.extra_out_nid[i];
-               if (!dac) {
-                       if (i > 0 && spec->multiout.extra_out_nid[0])
-                               dac = spec->multiout.extra_out_nid[0];
-                       else
-                               dac = spec->multiout.dac_nids[0];
-               }
-               alc_auto_set_output_and_unmute(codec, pin, PIN_OUT, dac);
-       }
-}
-
-/* check whether the given pin can be a multi-io pin */
-static bool can_be_multiio_pin(struct hda_codec *codec,
-                              unsigned int location, hda_nid_t nid)
-{
-       unsigned int defcfg, caps;
-
-       defcfg = snd_hda_codec_get_pincfg(codec, nid);
-       if (get_defcfg_connect(defcfg) != AC_JACK_PORT_COMPLEX)
-               return false;
-       if (location && get_defcfg_location(defcfg) != location)
-               return false;
-       caps = snd_hda_query_pin_caps(codec, nid);
-       if (!(caps & AC_PINCAP_OUT))
-               return false;
-       return true;
-}
-
-/*
- * multi-io helper
- *
- * When hardwired is set, try to fill ony hardwired pins, and returns
- * zero if any pins are filled, non-zero if nothing found.
- * When hardwired is off, try to fill possible input pins, and returns
- * the badness value.
- */
-static int alc_auto_fill_multi_ios(struct hda_codec *codec,
-                                  hda_nid_t reference_pin,
-                                  bool hardwired, int offset)
-{
-       struct alc_spec *spec = codec->spec;
-       struct auto_pin_cfg *cfg = &spec->autocfg;
-       int type, i, j, dacs, num_pins, old_pins;
-       unsigned int defcfg = snd_hda_codec_get_pincfg(codec, reference_pin);
-       unsigned int location = get_defcfg_location(defcfg);
-       int badness = 0;
-
-       old_pins = spec->multi_ios;
-       if (old_pins >= 2)
-               goto end_fill;
-
-       num_pins = 0;
-       for (type = AUTO_PIN_LINE_IN; type >= AUTO_PIN_MIC; type--) {
-               for (i = 0; i < cfg->num_inputs; i++) {
-                       if (cfg->inputs[i].type != type)
-                               continue;
-                       if (can_be_multiio_pin(codec, location,
-                                              cfg->inputs[i].pin))
-                               num_pins++;
-               }
-       }
-       if (num_pins < 2)
-               goto end_fill;
-
-       dacs = spec->multiout.num_dacs;
-       for (type = AUTO_PIN_LINE_IN; type >= AUTO_PIN_MIC; type--) {
-               for (i = 0; i < cfg->num_inputs; i++) {
-                       hda_nid_t nid = cfg->inputs[i].pin;
-                       hda_nid_t dac = 0;
-
-                       if (cfg->inputs[i].type != type)
-                               continue;
-                       if (!can_be_multiio_pin(codec, location, nid))
-                               continue;
-                       for (j = 0; j < spec->multi_ios; j++) {
-                               if (nid == spec->multi_io[j].pin)
-                                       break;
-                       }
-                       if (j < spec->multi_ios)
-                               continue;
-
-                       if (offset && offset + spec->multi_ios < dacs) {
-                               dac = spec->private_dac_nids[offset + spec->multi_ios];
-                               if (!alc_auto_is_dac_reachable(codec, nid, dac))
-                                       dac = 0;
-                       }
-                       if (hardwired)
-                               dac = get_dac_if_single(codec, nid);
-                       else if (!dac)
-                               dac = alc_auto_look_for_dac(codec, nid);
-                       if (!dac) {
-                               badness++;
-                               continue;
-                       }
-                       spec->multi_io[spec->multi_ios].pin = nid;
-                       spec->multi_io[spec->multi_ios].dac = dac;
-                       spec->multi_ios++;
-                       if (spec->multi_ios >= 2)
-                               break;
-               }
-       }
- end_fill:
-       if (badness)
-               badness = BAD_MULTI_IO;
-       if (old_pins == spec->multi_ios) {
-               if (hardwired)
-                       return 1; /* nothing found */
-               else
-                       return badness; /* no badness if nothing found */
-       }
-       if (!hardwired && spec->multi_ios < 2) {
-               spec->multi_ios = old_pins;
-               return badness;
+                               return err;
+               }
        }
+#endif
 
+       snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_BUILD);
        return 0;
 }
 
-static int alc_auto_ch_mode_info(struct snd_kcontrol *kcontrol,
-                                struct snd_ctl_elem_info *uinfo)
-{
-       struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-       struct alc_spec *spec = codec->spec;
-
-       uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-       uinfo->count = 1;
-       uinfo->value.enumerated.items = spec->multi_ios + 1;
-       if (uinfo->value.enumerated.item > spec->multi_ios)
-               uinfo->value.enumerated.item = spec->multi_ios;
-       sprintf(uinfo->value.enumerated.name, "%dch",
-               (uinfo->value.enumerated.item + 1) * 2);
-       return 0;
-}
 
-static int alc_auto_ch_mode_get(struct snd_kcontrol *kcontrol,
-                               struct snd_ctl_elem_value *ucontrol)
-{
-       struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-       struct alc_spec *spec = codec->spec;
-       ucontrol->value.enumerated.item[0] = (spec->ext_channel_count - 1) / 2;
-       return 0;
-}
+/*
+ * Common callbacks
+ */
 
-static int alc_set_multi_io(struct hda_codec *codec, int idx, bool output)
+static int alc_init(struct hda_codec *codec)
 {
        struct alc_spec *spec = codec->spec;
-       hda_nid_t nid = spec->multi_io[idx].pin;
-
-       if (!spec->multi_io[idx].ctl_in)
-               spec->multi_io[idx].ctl_in =
-                       snd_hda_codec_read(codec, nid, 0,
-                                          AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
-       if (output) {
-               snd_hda_set_pin_ctl_cache(codec, nid, PIN_OUT);
-               if (get_wcaps(codec, nid) & AC_WCAP_OUT_AMP)
-                       snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0,
-                                                HDA_AMP_MUTE, 0);
-               alc_auto_select_dac(codec, nid, spec->multi_io[idx].dac);
-       } else {
-               if (get_wcaps(codec, nid) & AC_WCAP_OUT_AMP)
-                       snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0,
-                                                HDA_AMP_MUTE, HDA_AMP_MUTE);
-               snd_hda_set_pin_ctl_cache(codec, nid,
-                                         spec->multi_io[idx].ctl_in);
-       }
-       return 0;
-}
 
-static int alc_auto_ch_mode_put(struct snd_kcontrol *kcontrol,
-                               struct snd_ctl_elem_value *ucontrol)
-{
-       struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-       struct alc_spec *spec = codec->spec;
-       int i, ch;
+       if (spec->init_hook)
+               spec->init_hook(codec);
 
-       ch = ucontrol->value.enumerated.item[0];
-       if (ch < 0 || ch > spec->multi_ios)
-               return -EINVAL;
-       if (ch == (spec->ext_channel_count - 1) / 2)
-               return 0;
-       spec->ext_channel_count = (ch + 1) * 2;
-       for (i = 0; i < spec->multi_ios; i++)
-               alc_set_multi_io(codec, i, i < ch);
-       spec->multiout.max_channels = max(spec->ext_channel_count,
-                                         spec->const_channel_count);
-       if (spec->need_dac_fix)
-               spec->multiout.num_dacs = spec->multiout.max_channels / 2;
-       return 1;
-}
+       alc_fix_pll(codec);
+       alc_auto_init_amp(codec, spec->init_amp);
 
-static const struct snd_kcontrol_new alc_auto_channel_mode_enum = {
-       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-       .name = "Channel Mode",
-       .info = alc_auto_ch_mode_info,
-       .get = alc_auto_ch_mode_get,
-       .put = alc_auto_ch_mode_put,
-};
+       snd_hda_gen_init(codec);
 
-static int alc_auto_add_multi_channel_mode(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
+       snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_INIT);
 
-       if (spec->multi_ios > 0) {
-               if (!alc_kcontrol_new(spec, "Channel Mode",
-                                     &alc_auto_channel_mode_enum))
-                       return -ENOMEM;
-       }
        return 0;
 }
 
-/* filter out invalid adc_nids (and capsrc_nids) that don't give all
- * active input pins
- */
-static void alc_remove_invalid_adc_nids(struct hda_codec *codec)
+static inline void alc_shutup(struct hda_codec *codec)
 {
        struct alc_spec *spec = codec->spec;
-       const struct hda_input_mux *imux;
-       hda_nid_t adc_nids[ARRAY_SIZE(spec->private_adc_nids)];
-       hda_nid_t capsrc_nids[ARRAY_SIZE(spec->private_adc_nids)];
-       int i, n, nums;
-
-       imux = spec->input_mux;
-       if (!imux)
-               return;
-       if (spec->dyn_adc_switch)
-               return;
-
- again:
-       nums = 0;
-       for (n = 0; n < spec->num_adc_nids; n++) {
-               hda_nid_t cap = spec->private_capsrc_nids[n];
-               int num_conns = snd_hda_get_num_conns(codec, cap);
-               for (i = 0; i < imux->num_items; i++) {
-                       hda_nid_t pin = spec->imux_pins[i];
-                       if (pin) {
-                               if (get_connection_index(codec, cap, pin) < 0)
-                                       break;
-                       } else if (num_conns <= imux->items[i].index)
-                               break;
-               }
-               if (i >= imux->num_items) {
-                       adc_nids[nums] = spec->private_adc_nids[n];
-                       capsrc_nids[nums++] = cap;
-               }
-       }
-       if (!nums) {
-               /* check whether ADC-switch is possible */
-               if (!alc_check_dyn_adc_switch(codec)) {
-                       if (spec->shared_mic_hp) {
-                               spec->shared_mic_hp = 0;
-                               spec->private_imux[0].num_items = 1;
-                               goto again;
-                       }
-                       printk(KERN_WARNING "hda_codec: %s: no valid ADC found;"
-                              " using fallback 0x%x\n",
-                              codec->chip_name, spec->private_adc_nids[0]);
-                       spec->num_adc_nids = 1;
-                       spec->auto_mic = 0;
-                       return;
-               }
-       } else if (nums != spec->num_adc_nids) {
-               memcpy(spec->private_adc_nids, adc_nids,
-                      nums * sizeof(hda_nid_t));
-               memcpy(spec->private_capsrc_nids, capsrc_nids,
-                      nums * sizeof(hda_nid_t));
-               spec->num_adc_nids = nums;
-       }
 
-       if (spec->auto_mic)
-               alc_auto_mic_check_imux(codec); /* check auto-mic setups */
-       else if (spec->input_mux->num_items == 1 || spec->shared_mic_hp)
-               spec->num_adc_nids = 1; /* reduce to a single ADC */
+       if (spec && spec->shutup)
+               spec->shutup(codec);
+       snd_hda_shutup_pins(codec);
 }
 
-/*
- * initialize ADC paths
- */
-static void alc_auto_init_adc(struct hda_codec *codec, int adc_idx)
+static void alc_free(struct hda_codec *codec)
 {
        struct alc_spec *spec = codec->spec;
-       hda_nid_t nid;
 
-       nid = spec->adc_nids[adc_idx];
-       /* mute ADC */
-       if (nid_has_mute(codec, nid, HDA_INPUT)) {
-               snd_hda_codec_write(codec, nid, 0,
-                                   AC_VERB_SET_AMP_GAIN_MUTE,
-                                   AMP_IN_MUTE(0));
-               return;
-       }
-       if (!spec->capsrc_nids)
+       if (!spec)
                return;
-       nid = spec->capsrc_nids[adc_idx];
-       if (nid_has_mute(codec, nid, HDA_OUTPUT))
-               snd_hda_codec_write(codec, nid, 0,
-                                   AC_VERB_SET_AMP_GAIN_MUTE,
-                                   AMP_OUT_MUTE);
+
+       snd_hda_gen_spec_free(&spec->gen);
+       snd_hda_detach_beep_device(codec);
+       kfree(spec);
 }
 
-static void alc_auto_init_input_src(struct hda_codec *codec)
+#ifdef CONFIG_PM
+static void alc_power_eapd(struct hda_codec *codec)
 {
-       struct alc_spec *spec = codec->spec;
-       int c, nums;
-
-       for (c = 0; c < spec->num_adc_nids; c++)
-               alc_auto_init_adc(codec, c);
-       if (spec->dyn_adc_switch)
-               nums = 1;
-       else
-               nums = spec->num_adc_nids;
-       for (c = 0; c < nums; c++)
-               alc_mux_select(codec, c, spec->cur_mux[c], true);
+       alc_auto_setup_eapd(codec, false);
 }
 
-/* add mic boosts if needed */
-static int alc_auto_add_mic_boost(struct hda_codec *codec)
+static int alc_suspend(struct hda_codec *codec)
 {
        struct alc_spec *spec = codec->spec;
-       struct auto_pin_cfg *cfg = &spec->autocfg;
-       int i, err;
-       int type_idx = 0;
-       hda_nid_t nid;
-       const char *prev_label = NULL;
-
-       for (i = 0; i < cfg->num_inputs; i++) {
-               if (cfg->inputs[i].type > AUTO_PIN_MIC)
-                       break;
-               nid = cfg->inputs[i].pin;
-               if (get_wcaps(codec, nid) & AC_WCAP_IN_AMP) {
-                       const char *label;
-                       char boost_label[32];
-
-                       label = hda_get_autocfg_input_label(codec, cfg, i);
-                       if (spec->shared_mic_hp && !strcmp(label, "Misc"))
-                               label = "Headphone Mic";
-                       if (prev_label && !strcmp(label, prev_label))
-                               type_idx++;
-                       else
-                               type_idx = 0;
-                       prev_label = label;
-
-                       snprintf(boost_label, sizeof(boost_label),
-                                "%s Boost Volume", label);
-                       err = add_control(spec, ALC_CTL_WIDGET_VOL,
-                                         boost_label, type_idx,
-                                 HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_INPUT));
-                       if (err < 0)
-                               return err;
-               }
-       }
+       alc_shutup(codec);
+       if (spec && spec->power_hook)
+               spec->power_hook(codec);
        return 0;
 }
+#endif
 
-/* select or unmute the given capsrc route */
-static void select_or_unmute_capsrc(struct hda_codec *codec, hda_nid_t cap,
-                                   int idx)
+#ifdef CONFIG_PM
+static int alc_resume(struct hda_codec *codec)
 {
-       if (get_wcaps_type(get_wcaps(codec, cap)) == AC_WID_AUD_MIX) {
-               snd_hda_codec_amp_stereo(codec, cap, HDA_INPUT, idx,
-                                        HDA_AMP_MUTE, 0);
-       } else if (snd_hda_get_num_conns(codec, cap) > 1) {
-               snd_hda_codec_write_cache(codec, cap, 0,
-                                         AC_VERB_SET_CONNECT_SEL, idx);
-       }
+       msleep(150); /* to avoid pop noise */
+       codec->patch_ops.init(codec);
+       snd_hda_codec_resume_amp(codec);
+       snd_hda_codec_resume_cache(codec);
+       alc_inv_dmic_sync(codec, true);
+       hda_call_check_power_status(codec, 0x01);
+       return 0;
 }
+#endif
 
-/* set the default connection to that pin */
-static int init_capsrc_for_pin(struct hda_codec *codec, hda_nid_t pin)
-{
-       struct alc_spec *spec = codec->spec;
-       int i;
+/*
+ */
+static const struct hda_codec_ops alc_patch_ops = {
+       .build_controls = alc_build_controls,
+       .build_pcms = snd_hda_gen_build_pcms,
+       .init = alc_init,
+       .free = alc_free,
+       .unsol_event = snd_hda_jack_unsol_event,
+#ifdef CONFIG_PM
+       .resume = alc_resume,
+       .suspend = alc_suspend,
+       .check_power_status = snd_hda_gen_check_power_status,
+#endif
+       .reboot_notify = alc_shutup,
+};
 
-       if (!pin)
-               return 0;
-       for (i = 0; i < spec->num_adc_nids; i++) {
-               hda_nid_t cap = get_capsrc(spec, i);
-               int idx;
 
-               idx = get_connection_index(codec, cap, pin);
-               if (idx < 0)
-                       continue;
-               select_or_unmute_capsrc(codec, cap, idx);
-               return i; /* return the found index */
+/* replace the codec chip_name with the given string */
+static int alc_codec_rename(struct hda_codec *codec, const char *name)
+{
+       kfree(codec->chip_name);
+       codec->chip_name = kstrdup(name, GFP_KERNEL);
+       if (!codec->chip_name) {
+               alc_free(codec);
+               return -ENOMEM;
        }
-       return -1; /* not found */
+       return 0;
 }
 
-/* initialize some special cases for input sources */
-static void alc_init_special_input_src(struct hda_codec *codec)
-{
-       struct alc_spec *spec = codec->spec;
-       int i;
+/*
+ * Rename codecs appropriately from COEF value
+ */
+struct alc_codec_rename_table {
+       unsigned int vendor_id;
+       unsigned short coef_mask;
+       unsigned short coef_bits;
+       const char *name;
+};
 
-       for (i = 0; i < spec->autocfg.num_inputs; i++)
-               init_capsrc_for_pin(codec, spec->autocfg.inputs[i].pin);
-}
+static struct alc_codec_rename_table rename_tbl[] = {
+       { 0x10ec0269, 0xfff0, 0x3010, "ALC277" },
+       { 0x10ec0269, 0xf0f0, 0x2010, "ALC259" },
+       { 0x10ec0269, 0xf0f0, 0x3010, "ALC258" },
+       { 0x10ec0269, 0x00f0, 0x0010, "ALC269VB" },
+       { 0x10ec0269, 0xffff, 0xa023, "ALC259" },
+       { 0x10ec0269, 0xffff, 0x6023, "ALC281X" },
+       { 0x10ec0269, 0x00f0, 0x0020, "ALC269VC" },
+       { 0x10ec0269, 0x00f0, 0x0030, "ALC269VD" },
+       { 0x10ec0887, 0x00f0, 0x0030, "ALC887-VD" },
+       { 0x10ec0888, 0x00f0, 0x0030, "ALC888-VD" },
+       { 0x10ec0888, 0xf0f0, 0x3020, "ALC886" },
+       { 0x10ec0899, 0x2000, 0x2000, "ALC899" },
+       { 0x10ec0892, 0xffff, 0x8020, "ALC661" },
+       { 0x10ec0892, 0xffff, 0x8011, "ALC661" },
+       { 0x10ec0892, 0xffff, 0x4011, "ALC656" },
+       { } /* terminator */
+};
 
-/* assign appropriate capture mixers */
-static void set_capture_mixer(struct hda_codec *codec)
+static int alc_codec_rename_from_preset(struct hda_codec *codec)
 {
-       struct alc_spec *spec = codec->spec;
-       static const struct snd_kcontrol_new *caps[2][3] = {
-               { alc_capture_mixer_nosrc1,
-                 alc_capture_mixer_nosrc2,
-                 alc_capture_mixer_nosrc3 },
-               { alc_capture_mixer1,
-                 alc_capture_mixer2,
-                 alc_capture_mixer3 },
-       };
-
-       /* check whether either of ADC or MUX has a volume control */
-       if (!nid_has_volume(codec, spec->adc_nids[0], HDA_INPUT)) {
-               if (!spec->capsrc_nids)
-                       return; /* no volume */
-               if (!nid_has_volume(codec, spec->capsrc_nids[0], HDA_OUTPUT))
-                       return; /* no volume in capsrc, too */
-               spec->vol_in_capsrc = 1;
-       }
+       const struct alc_codec_rename_table *p;
 
-       if (spec->num_adc_nids > 0) {
-               int mux = 0;
-               int num_adcs = 0;
-
-               if (spec->input_mux && spec->input_mux->num_items > 1)
-                       mux = 1;
-               if (spec->auto_mic) {
-                       num_adcs = 1;
-                       mux = 0;
-               } else if (spec->dyn_adc_switch)
-                       num_adcs = 1;
-               if (!num_adcs) {
-                       if (spec->num_adc_nids > 3)
-                               spec->num_adc_nids = 3;
-                       else if (!spec->num_adc_nids)
-                               return;
-                       num_adcs = spec->num_adc_nids;
-               }
-               spec->cap_mixer = caps[mux][num_adcs - 1];
+       for (p = rename_tbl; p->vendor_id; p++) {
+               if (p->vendor_id != codec->vendor_id)
+                       continue;
+               if ((alc_get_coef0(codec) & p->coef_mask) == p->coef_bits)
+                       return alc_codec_rename(codec, p->name);
        }
+       return 0;
 }
 
-/*
- * standard auto-parser initializations
- */
-static void alc_auto_init_std(struct hda_codec *codec)
-{
-       alc_auto_init_multi_out(codec);
-       alc_auto_init_extra_out(codec);
-       alc_auto_init_analog_input(codec);
-       alc_auto_init_input_src(codec);
-       alc_auto_init_digital(codec);
-       alc_inithook(codec);
-}
 
 /*
  * Digital-beep handlers
@@ -4273,93 +959,20 @@ static int alc_parse_auto_config(struct hda_codec *codec,
                                 const hda_nid_t *ssid_nids)
 {
        struct alc_spec *spec = codec->spec;
-       struct auto_pin_cfg *cfg = &spec->autocfg;
+       struct auto_pin_cfg *cfg = &spec->gen.autocfg;
        int err;
 
        err = snd_hda_parse_pin_defcfg(codec, cfg, ignore_nids,
                                       spec->parse_flags);
        if (err < 0)
                return err;
-       if (!cfg->line_outs) {
-               if (cfg->dig_outs || cfg->dig_in_pin) {
-                       spec->multiout.max_channels = 2;
-                       spec->no_analog = 1;
-                       goto dig_only;
-               }
-               return 0; /* can't find valid BIOS pin config */
-       }
-
-       if (!spec->no_primary_hp &&
-           cfg->line_out_type == AUTO_PIN_SPEAKER_OUT &&
-           cfg->line_outs <= cfg->hp_outs) {
-               /* use HP as primary out */
-               cfg->speaker_outs = cfg->line_outs;
-               memcpy(cfg->speaker_pins, cfg->line_out_pins,
-                      sizeof(cfg->speaker_pins));
-               cfg->line_outs = cfg->hp_outs;
-               memcpy(cfg->line_out_pins, cfg->hp_pins, sizeof(cfg->hp_pins));
-               cfg->hp_outs = 0;
-               memset(cfg->hp_pins, 0, sizeof(cfg->hp_pins));
-               cfg->line_out_type = AUTO_PIN_HP_OUT;
-       }
-
-       err = alc_auto_fill_dac_nids(codec);
-       if (err < 0)
-               return err;
-       err = alc_auto_add_multi_channel_mode(codec);
-       if (err < 0)
-               return err;
-       err = alc_auto_create_multi_out_ctls(codec, cfg);
-       if (err < 0)
-               return err;
-       err = alc_auto_create_hp_out(codec);
-       if (err < 0)
-               return err;
-       err = alc_auto_create_speaker_out(codec);
-       if (err < 0)
-               return err;
-       err = alc_auto_create_shared_input(codec);
-       if (err < 0)
-               return err;
-       err = alc_auto_create_input_ctls(codec);
-       if (err < 0)
-               return err;
-
-       /* check the multiple speaker pins */
-       if (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT)
-               spec->const_channel_count = cfg->line_outs * 2;
-       else
-               spec->const_channel_count = cfg->speaker_outs * 2;
-
-       if (spec->multi_ios > 0)
-               spec->multiout.max_channels = max(spec->ext_channel_count,
-                                                 spec->const_channel_count);
-       else
-               spec->multiout.max_channels = spec->multiout.num_dacs * 2;
-
- dig_only:
-       alc_auto_parse_digital(codec);
-
-       if (!spec->no_analog)
-               alc_remove_invalid_adc_nids(codec);
 
        if (ssid_nids)
                alc_ssid_check(codec, ssid_nids);
 
-       if (!spec->no_analog) {
-               err = alc_auto_check_switches(codec);
-               if (err < 0)
-                       return err;
-               err = alc_auto_add_mic_boost(codec);
-               if (err < 0)
-                       return err;
-       }
-
-       if (spec->kctls.list)
-               add_mixer(spec, spec->kctls.list);
-
-       if (!spec->no_analog && !spec->cap_mixer)
-               set_capture_mixer(codec);
+       err = snd_hda_gen_parse_auto_config(codec, cfg);
+       if (err < 0)
+               return err;
 
        return 1;
 }
@@ -4373,11 +986,12 @@ static int alc_alloc_spec(struct hda_codec *codec, hda_nid_t mixer_nid)
        if (!spec)
                return -ENOMEM;
        codec->spec = spec;
+       snd_hda_gen_spec_init(&spec->gen);
+       spec->gen.mixer_nid = mixer_nid;
+       spec->gen.own_eapd_ctl = 1;
        codec->single_adc_amp = 1;
-       spec->mixer_nid = mixer_nid;
-       snd_hda_gen_init(&spec->gen);
-       snd_array_init(&spec->kctls, sizeof(struct snd_kcontrol_new), 32);
-       snd_array_init(&spec->bind_ctls, sizeof(struct hda_bind_ctls *), 8);
+       /* FIXME: do we need this for all Realtek codec models? */
+       codec->spdif_status_reset = 1;
 
        err = alc_codec_rename_from_preset(codec);
        if (err < 0) {
@@ -4420,27 +1034,28 @@ enum {
        ALC880_FIXUP_6ST_BASE,
        ALC880_FIXUP_6ST,
        ALC880_FIXUP_6ST_DIG,
+       ALC880_FIXUP_6ST_AUTOMUTE,
 };
 
 /* enable the volume-knob widget support on NID 0x21 */
 static void alc880_fixup_vol_knob(struct hda_codec *codec,
-                                 const struct alc_fixup *fix, int action)
+                                 const struct hda_fixup *fix, int action)
 {
-       if (action == ALC_FIXUP_ACT_PROBE)
+       if (action == HDA_FIXUP_ACT_PROBE)
                snd_hda_jack_detect_enable_callback(codec, 0x21, ALC_DCVOL_EVENT, alc_update_knob_master);
 }
 
-static const struct alc_fixup alc880_fixups[] = {
+static const struct hda_fixup alc880_fixups[] = {
        [ALC880_FIXUP_GPIO1] = {
-               .type = ALC_FIXUP_VERBS,
+               .type = HDA_FIXUP_VERBS,
                .v.verbs = alc_gpio1_init_verbs,
        },
        [ALC880_FIXUP_GPIO2] = {
-               .type = ALC_FIXUP_VERBS,
+               .type = HDA_FIXUP_VERBS,
                .v.verbs = alc_gpio2_init_verbs,
        },
        [ALC880_FIXUP_MEDION_RIM] = {
-               .type = ALC_FIXUP_VERBS,
+               .type = HDA_FIXUP_VERBS,
                .v.verbs = (const struct hda_verb[]) {
                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x07 },
                        { 0x20, AC_VERB_SET_PROC_COEF,  0x3060 },
@@ -4450,8 +1065,8 @@ static const struct alc_fixup alc880_fixups[] = {
                .chain_id = ALC880_FIXUP_GPIO2,
        },
        [ALC880_FIXUP_LG] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        /* disable bogus unused pins */
                        { 0x16, 0x411111f0 },
                        { 0x18, 0x411111f0 },
@@ -4460,8 +1075,8 @@ static const struct alc_fixup alc880_fixups[] = {
                }
        },
        [ALC880_FIXUP_W810] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        /* disable bogus unused pins */
                        { 0x17, 0x411111f0 },
                        { }
@@ -4470,7 +1085,7 @@ static const struct alc_fixup alc880_fixups[] = {
                .chain_id = ALC880_FIXUP_GPIO2,
        },
        [ALC880_FIXUP_EAPD_COEF] = {
-               .type = ALC_FIXUP_VERBS,
+               .type = HDA_FIXUP_VERBS,
                .v.verbs = (const struct hda_verb[]) {
                        /* change to EAPD mode */
                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x07 },
@@ -4479,7 +1094,7 @@ static const struct alc_fixup alc880_fixups[] = {
                },
        },
        [ALC880_FIXUP_TCL_S700] = {
-               .type = ALC_FIXUP_VERBS,
+               .type = HDA_FIXUP_VERBS,
                .v.verbs = (const struct hda_verb[]) {
                        /* change to EAPD mode */
                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x07 },
@@ -4490,13 +1105,13 @@ static const struct alc_fixup alc880_fixups[] = {
                .chain_id = ALC880_FIXUP_GPIO2,
        },
        [ALC880_FIXUP_VOL_KNOB] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc880_fixup_vol_knob,
        },
        [ALC880_FIXUP_FUJITSU] = {
                /* override all pins as BIOS on old Amilo is broken */
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x14, 0x0121411f }, /* HP */
                        { 0x15, 0x99030120 }, /* speaker */
                        { 0x16, 0x99030130 }, /* bass speaker */
@@ -4515,8 +1130,8 @@ static const struct alc_fixup alc880_fixups[] = {
        },
        [ALC880_FIXUP_F1734] = {
                /* almost compatible with FUJITSU, but no bass and SPDIF */
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x14, 0x0121411f }, /* HP */
                        { 0x15, 0x99030120 }, /* speaker */
                        { 0x16, 0x411111f0 }, /* N/A */
@@ -4535,8 +1150,8 @@ static const struct alc_fixup alc880_fixups[] = {
        },
        [ALC880_FIXUP_UNIWILL] = {
                /* need to fix HP and speaker pins to be parsed correctly */
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x14, 0x0121411f }, /* HP */
                        { 0x15, 0x99030120 }, /* speaker */
                        { 0x16, 0x99030130 }, /* bass speaker */
@@ -4544,8 +1159,8 @@ static const struct alc_fixup alc880_fixups[] = {
                },
        },
        [ALC880_FIXUP_UNIWILL_DIG] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        /* disable bogus unused pins */
                        { 0x17, 0x411111f0 },
                        { 0x19, 0x411111f0 },
@@ -4555,8 +1170,8 @@ static const struct alc_fixup alc880_fixups[] = {
                }
        },
        [ALC880_FIXUP_Z71V] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        /* set up the whole pins as BIOS is utterly broken */
                        { 0x14, 0x99030120 }, /* speaker */
                        { 0x15, 0x0121411f }, /* HP */
@@ -4573,8 +1188,8 @@ static const struct alc_fixup alc880_fixups[] = {
                }
        },
        [ALC880_FIXUP_3ST_BASE] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x14, 0x01014010 }, /* line-out */
                        { 0x15, 0x411111f0 }, /* N/A */
                        { 0x16, 0x411111f0 }, /* N/A */
@@ -4591,8 +1206,8 @@ static const struct alc_fixup alc880_fixups[] = {
                }
        },
        [ALC880_FIXUP_3ST] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x1e, 0x411111f0 }, /* N/A */
                        { }
                },
@@ -4600,8 +1215,8 @@ static const struct alc_fixup alc880_fixups[] = {
                .chain_id = ALC880_FIXUP_3ST_BASE,
        },
        [ALC880_FIXUP_3ST_DIG] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x1e, 0x0144111e }, /* SPDIF */
                        { }
                },
@@ -4609,8 +1224,8 @@ static const struct alc_fixup alc880_fixups[] = {
                .chain_id = ALC880_FIXUP_3ST_BASE,
        },
        [ALC880_FIXUP_5ST_BASE] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x14, 0x01014010 }, /* front */
                        { 0x15, 0x411111f0 }, /* N/A */
                        { 0x16, 0x01011411 }, /* CLFE */
@@ -4627,8 +1242,8 @@ static const struct alc_fixup alc880_fixups[] = {
                }
        },
        [ALC880_FIXUP_5ST] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x1e, 0x411111f0 }, /* N/A */
                        { }
                },
@@ -4636,8 +1251,8 @@ static const struct alc_fixup alc880_fixups[] = {
                .chain_id = ALC880_FIXUP_5ST_BASE,
        },
        [ALC880_FIXUP_5ST_DIG] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x1e, 0x0144111e }, /* SPDIF */
                        { }
                },
@@ -4645,8 +1260,8 @@ static const struct alc_fixup alc880_fixups[] = {
                .chain_id = ALC880_FIXUP_5ST_BASE,
        },
        [ALC880_FIXUP_6ST_BASE] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x14, 0x01014010 }, /* front */
                        { 0x15, 0x01016412 }, /* surr */
                        { 0x16, 0x01011411 }, /* CLFE */
@@ -4663,8 +1278,8 @@ static const struct alc_fixup alc880_fixups[] = {
                }
        },
        [ALC880_FIXUP_6ST] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x1e, 0x411111f0 }, /* N/A */
                        { }
                },
@@ -4672,14 +1287,23 @@ static const struct alc_fixup alc880_fixups[] = {
                .chain_id = ALC880_FIXUP_6ST_BASE,
        },
        [ALC880_FIXUP_6ST_DIG] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x1e, 0x0144111e }, /* SPDIF */
                        { }
                },
                .chained = true,
                .chain_id = ALC880_FIXUP_6ST_BASE,
        },
+       [ALC880_FIXUP_6ST_AUTOMUTE] = {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
+                       { 0x1b, 0x0121401f }, /* HP with jack detect */
+                       { }
+               },
+               .chained_before = true,
+               .chain_id = ALC880_FIXUP_6ST_BASE,
+       },
 };
 
 static const struct snd_pci_quirk alc880_fixup_tbl[] = {
@@ -4694,7 +1318,7 @@ static const struct snd_pci_quirk alc880_fixup_tbl[] = {
        SND_PCI_QUIRK(0x1584, 0x9077, "Uniwill P53", ALC880_FIXUP_VOL_KNOB),
        SND_PCI_QUIRK(0x161f, 0x203d, "W810", ALC880_FIXUP_W810),
        SND_PCI_QUIRK(0x161f, 0x205d, "Medion Rim 2150", ALC880_FIXUP_MEDION_RIM),
-       SND_PCI_QUIRK(0x1631, 0xe011, "PB 13201056", ALC880_FIXUP_6ST),
+       SND_PCI_QUIRK(0x1631, 0xe011, "PB 13201056", ALC880_FIXUP_6ST_AUTOMUTE),
        SND_PCI_QUIRK(0x1734, 0x107c, "FSC F1734", ALC880_FIXUP_F1734),
        SND_PCI_QUIRK(0x1734, 0x1094, "FSC Amilo M1451G", ALC880_FIXUP_FUJITSU),
        SND_PCI_QUIRK(0x1734, 0x10ac, "FSC AMILO Xi 1526", ALC880_FIXUP_F1734),
@@ -4750,13 +1374,14 @@ static const struct snd_pci_quirk alc880_fixup_tbl[] = {
        {}
 };
 
-static const struct alc_model_fixup alc880_fixup_models[] = {
+static const struct hda_model_fixup alc880_fixup_models[] = {
        {.id = ALC880_FIXUP_3ST, .name = "3stack"},
        {.id = ALC880_FIXUP_3ST_DIG, .name = "3stack-digout"},
        {.id = ALC880_FIXUP_5ST, .name = "5stack"},
        {.id = ALC880_FIXUP_5ST_DIG, .name = "5stack-digout"},
        {.id = ALC880_FIXUP_6ST, .name = "6stack"},
        {.id = ALC880_FIXUP_6ST_DIG, .name = "6stack-digout"},
+       {.id = ALC880_FIXUP_6ST_AUTOMUTE, .name = "6stack-automute"},
        {}
 };
 
@@ -4774,18 +1399,18 @@ static int patch_alc880(struct hda_codec *codec)
                return err;
 
        spec = codec->spec;
-       spec->need_dac_fix = 1;
+       spec->gen.need_dac_fix = 1;
 
-       alc_pick_fixup(codec, alc880_fixup_models, alc880_fixup_tbl,
+       snd_hda_pick_fixup(codec, alc880_fixup_models, alc880_fixup_tbl,
                       alc880_fixups);
-       alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
+       snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
 
        /* automatic parse from the BIOS config */
        err = alc880_parse_auto_config(codec);
        if (err < 0)
                goto error;
 
-       if (!spec->no_analog) {
+       if (!spec->gen.no_analog) {
                err = snd_hda_attach_beep_device(codec, 0x1);
                if (err < 0)
                        goto error;
@@ -4796,7 +1421,7 @@ static int patch_alc880(struct hda_codec *codec)
        codec->patch_ops.unsol_event = alc880_unsol_event;
 
 
-       alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE);
+       snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);
 
        return 0;
 
@@ -4828,38 +1453,39 @@ enum {
        ALC260_FIXUP_REPLACER,
        ALC260_FIXUP_HP_B1900,
        ALC260_FIXUP_KN1,
+       ALC260_FIXUP_FSC_S7020,
 };
 
 static void alc260_gpio1_automute(struct hda_codec *codec)
 {
        struct alc_spec *spec = codec->spec;
        snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA,
-                           spec->hp_jack_present);
+                           spec->gen.hp_jack_present);
 }
 
 static void alc260_fixup_gpio1_toggle(struct hda_codec *codec,
-                                     const struct alc_fixup *fix, int action)
+                                     const struct hda_fixup *fix, int action)
 {
        struct alc_spec *spec = codec->spec;
-       if (action == ALC_FIXUP_ACT_PROBE) {
+       if (action == HDA_FIXUP_ACT_PROBE) {
                /* although the machine has only one output pin, we need to
                 * toggle GPIO1 according to the jack state
                 */
-               spec->automute_hook = alc260_gpio1_automute;
-               spec->detect_hp = 1;
-               spec->automute_speaker = 1;
-               spec->autocfg.hp_pins[0] = 0x0f; /* copy it for automute */
-               snd_hda_jack_detect_enable_callback(codec, 0x0f, ALC_HP_EVENT,
-                                                   alc_hp_automute);
-               snd_hda_gen_add_verbs(&spec->gen, alc_gpio1_init_verbs);
+               spec->gen.automute_hook = alc260_gpio1_automute;
+               spec->gen.detect_hp = 1;
+               spec->gen.automute_speaker = 1;
+               spec->gen.autocfg.hp_pins[0] = 0x0f; /* copy it for automute */
+               snd_hda_jack_detect_enable_callback(codec, 0x0f, HDA_GEN_HP_EVENT,
+                                                   snd_hda_gen_hp_automute);
+               snd_hda_add_verbs(codec, alc_gpio1_init_verbs);
        }
 }
 
 static void alc260_fixup_kn1(struct hda_codec *codec,
-                            const struct alc_fixup *fix, int action)
+                            const struct hda_fixup *fix, int action)
 {
        struct alc_spec *spec = codec->spec;
-       static const struct alc_pincfg pincfgs[] = {
+       static const struct hda_pintbl pincfgs[] = {
                { 0x0f, 0x02214000 }, /* HP/speaker */
                { 0x12, 0x90a60160 }, /* int mic */
                { 0x13, 0x02a19000 }, /* ext mic */
@@ -4876,32 +1502,41 @@ static void alc260_fixup_kn1(struct hda_codec *codec,
        };
 
        switch (action) {
-       case ALC_FIXUP_ACT_PRE_PROBE:
-               alc_apply_pincfgs(codec, pincfgs);
+       case HDA_FIXUP_ACT_PRE_PROBE:
+               snd_hda_apply_pincfgs(codec, pincfgs);
                break;
-       case ALC_FIXUP_ACT_PROBE:
+       case HDA_FIXUP_ACT_PROBE:
                spec->init_amp = ALC_INIT_NONE;
                break;
        }
 }
 
-static const struct alc_fixup alc260_fixups[] = {
+static void alc260_fixup_fsc_s7020(struct hda_codec *codec,
+                                  const struct hda_fixup *fix, int action)
+{
+       struct alc_spec *spec = codec->spec;
+
+       if (action == HDA_FIXUP_ACT_PRE_PROBE)
+               spec->gen.add_out_jack_modes = 1;
+}
+
+static const struct hda_fixup alc260_fixups[] = {
        [ALC260_FIXUP_HP_DC5750] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x11, 0x90130110 }, /* speaker */
                        { }
                }
        },
        [ALC260_FIXUP_HP_PIN_0F] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x0f, 0x01214000 }, /* HP */
                        { }
                }
        },
        [ALC260_FIXUP_COEF] = {
-               .type = ALC_FIXUP_VERBS,
+               .type = HDA_FIXUP_VERBS,
                .v.verbs = (const struct hda_verb[]) {
                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x07 },
                        { 0x20, AC_VERB_SET_PROC_COEF,  0x3040 },
@@ -4911,17 +1546,17 @@ static const struct alc_fixup alc260_fixups[] = {
                .chain_id = ALC260_FIXUP_HP_PIN_0F,
        },
        [ALC260_FIXUP_GPIO1] = {
-               .type = ALC_FIXUP_VERBS,
+               .type = HDA_FIXUP_VERBS,
                .v.verbs = alc_gpio1_init_verbs,
        },
        [ALC260_FIXUP_GPIO1_TOGGLE] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc260_fixup_gpio1_toggle,
                .chained = true,
                .chain_id = ALC260_FIXUP_HP_PIN_0F,
        },
        [ALC260_FIXUP_REPLACER] = {
-               .type = ALC_FIXUP_VERBS,
+               .type = HDA_FIXUP_VERBS,
                .v.verbs = (const struct hda_verb[]) {
                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x07 },
                        { 0x20, AC_VERB_SET_PROC_COEF,  0x3050 },
@@ -4931,15 +1566,19 @@ static const struct alc_fixup alc260_fixups[] = {
                .chain_id = ALC260_FIXUP_GPIO1_TOGGLE,
        },
        [ALC260_FIXUP_HP_B1900] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc260_fixup_gpio1_toggle,
                .chained = true,
                .chain_id = ALC260_FIXUP_COEF,
        },
        [ALC260_FIXUP_KN1] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc260_fixup_kn1,
        },
+       [ALC260_FIXUP_FSC_S7020] = {
+               .type = HDA_FIXUP_FUNC,
+               .v.func = alc260_fixup_fsc_s7020,
+       },
 };
 
 static const struct snd_pci_quirk alc260_fixup_tbl[] = {
@@ -4948,6 +1587,7 @@ static const struct snd_pci_quirk alc260_fixup_tbl[] = {
        SND_PCI_QUIRK(0x1025, 0x008f, "Acer", ALC260_FIXUP_GPIO1),
        SND_PCI_QUIRK(0x103c, 0x280a, "HP dc5750", ALC260_FIXUP_HP_DC5750),
        SND_PCI_QUIRK(0x103c, 0x30ba, "HP Presario B1900", ALC260_FIXUP_HP_B1900),
+       SND_PCI_QUIRK(0x10cf, 0x1326, "FSC LifeBook S7020", ALC260_FIXUP_FSC_S7020),
        SND_PCI_QUIRK(0x1509, 0x4540, "Favorit 100XS", ALC260_FIXUP_GPIO1),
        SND_PCI_QUIRK(0x152d, 0x0729, "Quanta KN1", ALC260_FIXUP_KN1),
        SND_PCI_QUIRK(0x161f, 0x2057, "Replacer 672V", ALC260_FIXUP_REPLACER),
@@ -4967,16 +1607,21 @@ static int patch_alc260(struct hda_codec *codec)
                return err;
 
        spec = codec->spec;
+       /* as quite a few machines require HP amp for speaker outputs,
+        * it's easier to enable it unconditionally; even if it's unneeded,
+        * it's almost harmless.
+        */
+       spec->gen.prefer_hp_amp = 1;
 
-       alc_pick_fixup(codec, NULL, alc260_fixup_tbl, alc260_fixups);
-       alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
+       snd_hda_pick_fixup(codec, NULL, alc260_fixup_tbl, alc260_fixups);
+       snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
 
        /* automatic parse from the BIOS config */
        err = alc260_parse_auto_config(codec);
        if (err < 0)
                goto error;
 
-       if (!spec->no_analog) {
+       if (!spec->gen.no_analog) {
                err = snd_hda_attach_beep_device(codec, 0x1);
                if (err < 0)
                        goto error;
@@ -4986,7 +1631,7 @@ static int patch_alc260(struct hda_codec *codec)
        codec->patch_ops = alc_patch_ops;
        spec->shutup = alc_eapd_shutup;
 
-       alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE);
+       snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);
 
        return 0;
 
@@ -5040,9 +1685,9 @@ enum {
 };
 
 static void alc889_fixup_coef(struct hda_codec *codec,
-                             const struct alc_fixup *fix, int action)
+                             const struct hda_fixup *fix, int action)
 {
-       if (action != ALC_FIXUP_ACT_INIT)
+       if (action != HDA_FIXUP_ACT_INIT)
                return;
        alc889_coef_init(codec);
 }
@@ -5082,9 +1727,9 @@ static void alc882_gpio_mute(struct hda_codec *codec, int pin, int muted)
 
 /* set up GPIO at initialization */
 static void alc885_fixup_macpro_gpio(struct hda_codec *codec,
-                                    const struct alc_fixup *fix, int action)
+                                    const struct hda_fixup *fix, int action)
 {
-       if (action != ALC_FIXUP_ACT_INIT)
+       if (action != HDA_FIXUP_ACT_INIT)
                return;
        alc882_gpio_mute(codec, 0, 0);
        alc882_gpio_mute(codec, 1, 0);
@@ -5095,9 +1740,9 @@ static void alc885_fixup_macpro_gpio(struct hda_codec *codec,
  * work correctly (bko#42740)
  */
 static void alc889_fixup_dac_route(struct hda_codec *codec,
-                                  const struct alc_fixup *fix, int action)
+                                  const struct hda_fixup *fix, int action)
 {
-       if (action == ALC_FIXUP_ACT_PRE_PROBE) {
+       if (action == HDA_FIXUP_ACT_PRE_PROBE) {
                /* fake the connections during parsing the tree */
                hda_nid_t conn1[2] = { 0x0c, 0x0d };
                hda_nid_t conn2[2] = { 0x0e, 0x0f };
@@ -5105,7 +1750,7 @@ static void alc889_fixup_dac_route(struct hda_codec *codec,
                snd_hda_override_conn_list(codec, 0x15, 2, conn1);
                snd_hda_override_conn_list(codec, 0x18, 2, conn2);
                snd_hda_override_conn_list(codec, 0x1a, 2, conn2);
-       } else if (action == ALC_FIXUP_ACT_PROBE) {
+       } else if (action == HDA_FIXUP_ACT_PROBE) {
                /* restore the connections */
                hda_nid_t conn[5] = { 0x0c, 0x0d, 0x0e, 0x0f, 0x26 };
                snd_hda_override_conn_list(codec, 0x14, 5, conn);
@@ -5117,62 +1762,60 @@ static void alc889_fixup_dac_route(struct hda_codec *codec,
 
 /* Set VREF on HP pin */
 static void alc889_fixup_mbp_vref(struct hda_codec *codec,
-                                 const struct alc_fixup *fix, int action)
+                                 const struct hda_fixup *fix, int action)
 {
        struct alc_spec *spec = codec->spec;
        static hda_nid_t nids[2] = { 0x14, 0x15 };
        int i;
 
-       if (action != ALC_FIXUP_ACT_INIT)
+       if (action != HDA_FIXUP_ACT_INIT)
                return;
        for (i = 0; i < ARRAY_SIZE(nids); i++) {
                unsigned int val = snd_hda_codec_get_pincfg(codec, nids[i]);
                if (get_defcfg_device(val) != AC_JACK_HP_OUT)
                        continue;
-               val = snd_hda_codec_read(codec, nids[i], 0,
-                                        AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
+               val = snd_hda_codec_get_pin_target(codec, nids[i]);
                val |= AC_PINCTL_VREF_80;
                snd_hda_set_pin_ctl(codec, nids[i], val);
-               spec->keep_vref_in_automute = 1;
+               spec->gen.keep_vref_in_automute = 1;
                break;
        }
 }
 
 /* Set VREF on speaker pins on imac91 */
 static void alc889_fixup_imac91_vref(struct hda_codec *codec,
-                                    const struct alc_fixup *fix, int action)
+                                    const struct hda_fixup *fix, int action)
 {
        struct alc_spec *spec = codec->spec;
        static hda_nid_t nids[2] = { 0x18, 0x1a };
        int i;
 
-       if (action != ALC_FIXUP_ACT_INIT)
+       if (action != HDA_FIXUP_ACT_INIT)
                return;
        for (i = 0; i < ARRAY_SIZE(nids); i++) {
                unsigned int val;
-               val = snd_hda_codec_read(codec, nids[i], 0,
-                                        AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
+               val = snd_hda_codec_get_pin_target(codec, nids[i]);
                val |= AC_PINCTL_VREF_50;
                snd_hda_set_pin_ctl(codec, nids[i], val);
        }
-       spec->keep_vref_in_automute = 1;
+       spec->gen.keep_vref_in_automute = 1;
 }
 
 /* Don't take HP output as primary
  * strangely, the speaker output doesn't work on VAIO Z through DAC 0x05
  */
 static void alc882_fixup_no_primary_hp(struct hda_codec *codec,
-                                      const struct alc_fixup *fix, int action)
+                                      const struct hda_fixup *fix, int action)
 {
        struct alc_spec *spec = codec->spec;
-       if (action == ALC_FIXUP_ACT_PRE_PROBE)
-               spec->no_primary_hp = 1;
+       if (action == HDA_FIXUP_ACT_PRE_PROBE)
+               spec->gen.no_primary_hp = 1;
 }
 
-static const struct alc_fixup alc882_fixups[] = {
+static const struct hda_fixup alc882_fixups[] = {
        [ALC882_FIXUP_ABIT_AW9D_MAX] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x15, 0x01080104 }, /* side */
                        { 0x16, 0x01011012 }, /* rear */
                        { 0x17, 0x01016011 }, /* clfe */
@@ -5180,47 +1823,47 @@ static const struct alc_fixup alc882_fixups[] = {
                }
        },
        [ALC882_FIXUP_LENOVO_Y530] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x15, 0x99130112 }, /* rear int speakers */
                        { 0x16, 0x99130111 }, /* subwoofer */
                        { }
                }
        },
        [ALC882_FIXUP_PB_M5210] = {
-               .type = ALC_FIXUP_VERBS,
-               .v.verbs = (const struct hda_verb[]) {
-                       { 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50 },
+               .type = HDA_FIXUP_PINCTLS,
+               .v.pins = (const struct hda_pintbl[]) {
+                       { 0x19, PIN_VREF50 },
                        {}
                }
        },
        [ALC882_FIXUP_ACER_ASPIRE_7736] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc_fixup_sku_ignore,
        },
        [ALC882_FIXUP_ASUS_W90V] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x16, 0x99130110 }, /* fix sequence for CLFE */
                        { }
                }
        },
        [ALC889_FIXUP_CD] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x1c, 0x993301f0 }, /* CD */
                        { }
                }
        },
        [ALC889_FIXUP_VAIO_TT] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x17, 0x90170111 }, /* hidden surround speaker */
                        { }
                }
        },
        [ALC888_FIXUP_EEE1601] = {
-               .type = ALC_FIXUP_VERBS,
+               .type = HDA_FIXUP_VERBS,
                .v.verbs = (const struct hda_verb[]) {
                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x0b },
                        { 0x20, AC_VERB_SET_PROC_COEF,  0x0838 },
@@ -5228,7 +1871,7 @@ static const struct alc_fixup alc882_fixups[] = {
                }
        },
        [ALC882_FIXUP_EAPD] = {
-               .type = ALC_FIXUP_VERBS,
+               .type = HDA_FIXUP_VERBS,
                .v.verbs = (const struct hda_verb[]) {
                        /* change to EAPD mode */
                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x07 },
@@ -5237,7 +1880,7 @@ static const struct alc_fixup alc882_fixups[] = {
                }
        },
        [ALC883_FIXUP_EAPD] = {
-               .type = ALC_FIXUP_VERBS,
+               .type = HDA_FIXUP_VERBS,
                .v.verbs = (const struct hda_verb[]) {
                        /* change to EAPD mode */
                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x07 },
@@ -5246,7 +1889,7 @@ static const struct alc_fixup alc882_fixups[] = {
                }
        },
        [ALC883_FIXUP_ACER_EAPD] = {
-               .type = ALC_FIXUP_VERBS,
+               .type = HDA_FIXUP_VERBS,
                .v.verbs = (const struct hda_verb[]) {
                        /* eanable EAPD on Acer laptops */
                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x07 },
@@ -5255,30 +1898,30 @@ static const struct alc_fixup alc882_fixups[] = {
                }
        },
        [ALC882_FIXUP_GPIO1] = {
-               .type = ALC_FIXUP_VERBS,
+               .type = HDA_FIXUP_VERBS,
                .v.verbs = alc_gpio1_init_verbs,
        },
        [ALC882_FIXUP_GPIO2] = {
-               .type = ALC_FIXUP_VERBS,
+               .type = HDA_FIXUP_VERBS,
                .v.verbs = alc_gpio2_init_verbs,
        },
        [ALC882_FIXUP_GPIO3] = {
-               .type = ALC_FIXUP_VERBS,
+               .type = HDA_FIXUP_VERBS,
                .v.verbs = alc_gpio3_init_verbs,
        },
        [ALC882_FIXUP_ASUS_W2JC] = {
-               .type = ALC_FIXUP_VERBS,
+               .type = HDA_FIXUP_VERBS,
                .v.verbs = alc_gpio1_init_verbs,
                .chained = true,
                .chain_id = ALC882_FIXUP_EAPD,
        },
        [ALC889_FIXUP_COEF] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc889_fixup_coef,
        },
        [ALC882_FIXUP_ACER_ASPIRE_4930G] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x16, 0x99130111 }, /* CLFE speaker */
                        { 0x17, 0x99130112 }, /* surround speaker */
                        { }
@@ -5287,8 +1930,8 @@ static const struct alc_fixup alc882_fixups[] = {
                .chain_id = ALC882_FIXUP_GPIO1,
        },
        [ALC882_FIXUP_ACER_ASPIRE_8930G] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x16, 0x99130111 }, /* CLFE speaker */
                        { 0x1b, 0x99130112 }, /* surround speaker */
                        { }
@@ -5298,7 +1941,7 @@ static const struct alc_fixup alc882_fixups[] = {
        },
        [ALC882_FIXUP_ASPIRE_8930G_VERBS] = {
                /* additional init verbs for Acer Aspire 8930G */
-               .type = ALC_FIXUP_VERBS,
+               .type = HDA_FIXUP_VERBS,
                .v.verbs = (const struct hda_verb[]) {
                        /* Enable all DACs */
                        /* DAC DISABLE/MUTE 1? */
@@ -5332,31 +1975,31 @@ static const struct alc_fixup alc882_fixups[] = {
                .chain_id = ALC882_FIXUP_GPIO1,
        },
        [ALC885_FIXUP_MACPRO_GPIO] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc885_fixup_macpro_gpio,
        },
        [ALC889_FIXUP_DAC_ROUTE] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc889_fixup_dac_route,
        },
        [ALC889_FIXUP_MBP_VREF] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc889_fixup_mbp_vref,
                .chained = true,
                .chain_id = ALC882_FIXUP_GPIO1,
        },
        [ALC889_FIXUP_IMAC91_VREF] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc889_fixup_imac91_vref,
                .chained = true,
                .chain_id = ALC882_FIXUP_GPIO1,
        },
        [ALC882_FIXUP_INV_DMIC] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc_fixup_inv_dmic_0x12,
        },
        [ALC882_FIXUP_NO_PRIMARY_HP] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc882_fixup_no_primary_hp,
        },
 };
@@ -5431,7 +2074,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = {
        {}
 };
 
-static const struct alc_model_fixup alc882_fixup_models[] = {
+static const struct hda_model_fixup alc882_fixup_models[] = {
        {.id = ALC882_FIXUP_ACER_ASPIRE_4930G, .name = "acer-aspire-4930g"},
        {.id = ALC882_FIXUP_ACER_ASPIRE_8930G, .name = "acer-aspire-8930g"},
        {.id = ALC883_FIXUP_ACER_EAPD, .name = "acer-aspire"},
@@ -5474,9 +2117,9 @@ static int patch_alc882(struct hda_codec *codec)
                break;
        }
 
-       alc_pick_fixup(codec, alc882_fixup_models, alc882_fixup_tbl,
+       snd_hda_pick_fixup(codec, alc882_fixup_models, alc882_fixup_tbl,
                       alc882_fixups);
-       alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
+       snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
 
        alc_auto_parse_customize_define(codec);
 
@@ -5485,7 +2128,7 @@ static int patch_alc882(struct hda_codec *codec)
        if (err < 0)
                goto error;
 
-       if (!spec->no_analog && has_cdefine_beep(codec)) {
+       if (!spec->gen.no_analog && has_cdefine_beep(codec)) {
                err = snd_hda_attach_beep_device(codec, 0x1);
                if (err < 0)
                        goto error;
@@ -5494,7 +2137,7 @@ static int patch_alc882(struct hda_codec *codec)
 
        codec->patch_ops = alc_patch_ops;
 
-       alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE);
+       snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);
 
        return 0;
 
@@ -5519,6 +2162,7 @@ static int alc262_parse_auto_config(struct hda_codec *codec)
  */
 enum {
        ALC262_FIXUP_FSC_H270,
+       ALC262_FIXUP_FSC_S7110,
        ALC262_FIXUP_HP_Z200,
        ALC262_FIXUP_TYAN,
        ALC262_FIXUP_LENOVO_3000,
@@ -5527,41 +2171,50 @@ enum {
        ALC262_FIXUP_INV_DMIC,
 };
 
-static const struct alc_fixup alc262_fixups[] = {
+static const struct hda_fixup alc262_fixups[] = {
        [ALC262_FIXUP_FSC_H270] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x14, 0x99130110 }, /* speaker */
                        { 0x15, 0x0221142f }, /* front HP */
                        { 0x1b, 0x0121141f }, /* rear HP */
                        { }
                }
        },
+       [ALC262_FIXUP_FSC_S7110] = {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
+                       { 0x15, 0x90170110 }, /* speaker */
+                       { }
+               },
+               .chained = true,
+               .chain_id = ALC262_FIXUP_BENQ,
+       },
        [ALC262_FIXUP_HP_Z200] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x16, 0x99130120 }, /* internal speaker */
                        { }
                }
        },
        [ALC262_FIXUP_TYAN] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x14, 0x1993e1f0 }, /* int AUX */
                        { }
                }
        },
        [ALC262_FIXUP_LENOVO_3000] = {
-               .type = ALC_FIXUP_VERBS,
-               .v.verbs = (const struct hda_verb[]) {
-                       { 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50 },
+               .type = HDA_FIXUP_PINCTLS,
+               .v.pins = (const struct hda_pintbl[]) {
+                       { 0x19, PIN_VREF50 },
                        {}
                },
                .chained = true,
                .chain_id = ALC262_FIXUP_BENQ,
        },
        [ALC262_FIXUP_BENQ] = {
-               .type = ALC_FIXUP_VERBS,
+               .type = HDA_FIXUP_VERBS,
                .v.verbs = (const struct hda_verb[]) {
                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x07 },
                        { 0x20, AC_VERB_SET_PROC_COEF, 0x3070 },
@@ -5569,7 +2222,7 @@ static const struct alc_fixup alc262_fixups[] = {
                }
        },
        [ALC262_FIXUP_BENQ_T31] = {
-               .type = ALC_FIXUP_VERBS,
+               .type = HDA_FIXUP_VERBS,
                .v.verbs = (const struct hda_verb[]) {
                        { 0x20, AC_VERB_SET_COEF_INDEX, 0x07 },
                        { 0x20, AC_VERB_SET_PROC_COEF, 0x3050 },
@@ -5577,14 +2230,14 @@ static const struct alc_fixup alc262_fixups[] = {
                }
        },
        [ALC262_FIXUP_INV_DMIC] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc_fixup_inv_dmic_0x12,
        },
 };
 
 static const struct snd_pci_quirk alc262_fixup_tbl[] = {
        SND_PCI_QUIRK(0x103c, 0x170b, "HP Z200", ALC262_FIXUP_HP_Z200),
-       SND_PCI_QUIRK(0x10cf, 0x1397, "Fujitsu", ALC262_FIXUP_BENQ),
+       SND_PCI_QUIRK(0x10cf, 0x1397, "Fujitsu Lifebook S7110", ALC262_FIXUP_FSC_S7110),
        SND_PCI_QUIRK(0x10cf, 0x142d, "Fujitsu Lifebook E8410", ALC262_FIXUP_BENQ),
        SND_PCI_QUIRK(0x10f1, 0x2915, "Tyan Thunder n6650W", ALC262_FIXUP_TYAN),
        SND_PCI_QUIRK(0x1734, 0x1147, "FSC Celsius H270", ALC262_FIXUP_FSC_H270),
@@ -5594,7 +2247,7 @@ static const struct snd_pci_quirk alc262_fixup_tbl[] = {
        {}
 };
 
-static const struct alc_model_fixup alc262_fixup_models[] = {
+static const struct hda_model_fixup alc262_fixup_models[] = {
        {.id = ALC262_FIXUP_INV_DMIC, .name = "inv-dmic"},
        {}
 };
@@ -5611,6 +2264,7 @@ static int patch_alc262(struct hda_codec *codec)
                return err;
 
        spec = codec->spec;
+       spec->gen.shared_mic_vref_pin = 0x18;
 
 #if 0
        /* pshou 07/11/05  set a zero PCM sample to DAC when FIFO is
@@ -5626,9 +2280,9 @@ static int patch_alc262(struct hda_codec *codec)
 #endif
        alc_fix_pll_init(codec, 0x20, 0x0a, 10);
 
-       alc_pick_fixup(codec, alc262_fixup_models, alc262_fixup_tbl,
+       snd_hda_pick_fixup(codec, alc262_fixup_models, alc262_fixup_tbl,
                       alc262_fixups);
-       alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
+       snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
 
        alc_auto_parse_customize_define(codec);
 
@@ -5637,7 +2291,7 @@ static int patch_alc262(struct hda_codec *codec)
        if (err < 0)
                goto error;
 
-       if (!spec->no_analog && has_cdefine_beep(codec)) {
+       if (!spec->gen.no_analog && has_cdefine_beep(codec)) {
                err = snd_hda_attach_beep_device(codec, 0x1);
                if (err < 0)
                        goto error;
@@ -5647,7 +2301,7 @@ static int patch_alc262(struct hda_codec *codec)
        codec->patch_ops = alc_patch_ops;
        spec->shutup = alc_eapd_shutup;
 
-       alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE);
+       snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);
 
        return 0;
 
@@ -5688,13 +2342,13 @@ enum {
        ALC268_FIXUP_HP_EAPD,
 };
 
-static const struct alc_fixup alc268_fixups[] = {
+static const struct hda_fixup alc268_fixups[] = {
        [ALC268_FIXUP_INV_DMIC] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc_fixup_inv_dmic_0x12,
        },
        [ALC268_FIXUP_HP_EAPD] = {
-               .type = ALC_FIXUP_VERBS,
+               .type = HDA_FIXUP_VERBS,
                .v.verbs = (const struct hda_verb[]) {
                        {0x15, AC_VERB_SET_EAPD_BTLENABLE, 0},
                        {}
@@ -5702,7 +2356,7 @@ static const struct alc_fixup alc268_fixups[] = {
        },
 };
 
-static const struct alc_model_fixup alc268_fixup_models[] = {
+static const struct hda_model_fixup alc268_fixup_models[] = {
        {.id = ALC268_FIXUP_INV_DMIC, .name = "inv-dmic"},
        {.id = ALC268_FIXUP_HP_EAPD, .name = "hp-eapd"},
        {}
@@ -5726,9 +2380,10 @@ static int alc268_parse_auto_config(struct hda_codec *codec)
        struct alc_spec *spec = codec->spec;
        int err = alc_parse_auto_config(codec, NULL, alc268_ssids);
        if (err > 0) {
-               if (!spec->no_analog && spec->autocfg.speaker_pins[0] != 0x1d) {
+               if (!spec->gen.no_analog &&
+                   spec->gen.autocfg.speaker_pins[0] != 0x1d) {
                        add_mixer(spec, alc268_beep_mixer);
-                       snd_hda_gen_add_verbs(&spec->gen, alc268_beep_init_verbs);
+                       snd_hda_add_verbs(codec, alc268_beep_init_verbs);
                }
        }
        return err;
@@ -5748,8 +2403,8 @@ static int patch_alc268(struct hda_codec *codec)
 
        spec = codec->spec;
 
-       alc_pick_fixup(codec, alc268_fixup_models, alc268_fixup_tbl, alc268_fixups);
-       alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
+       snd_hda_pick_fixup(codec, alc268_fixup_models, alc268_fixup_tbl, alc268_fixups);
+       snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
 
        /* automatic parse from the BIOS config */
        err = alc268_parse_auto_config(codec);
@@ -5780,7 +2435,7 @@ static int patch_alc268(struct hda_codec *codec)
        codec->patch_ops = alc_patch_ops;
        spec->shutup = alc_eapd_shutup;
 
-       alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE);
+       snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);
 
        return 0;
 
@@ -5792,6 +2447,35 @@ static int patch_alc268(struct hda_codec *codec)
 /*
  * ALC269
  */
+
+static int playback_pcm_open(struct hda_pcm_stream *hinfo,
+                            struct hda_codec *codec,
+                            struct snd_pcm_substream *substream)
+{
+       struct hda_gen_spec *spec = codec->spec;
+       return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream,
+                                            hinfo);
+}
+
+static int playback_pcm_prepare(struct hda_pcm_stream *hinfo,
+                               struct hda_codec *codec,
+                               unsigned int stream_tag,
+                               unsigned int format,
+                               struct snd_pcm_substream *substream)
+{
+       struct hda_gen_spec *spec = codec->spec;
+       return snd_hda_multi_out_analog_prepare(codec, &spec->multiout,
+                                               stream_tag, format, substream);
+}
+
+static int playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
+                               struct hda_codec *codec,
+                               struct snd_pcm_substream *substream)
+{
+       struct hda_gen_spec *spec = codec->spec;
+       return snd_hda_multi_out_analog_cleanup(codec, &spec->multiout);
+}
+
 static const struct hda_pcm_stream alc269_44k_pcm_analog_playback = {
        .substreams = 1,
        .channels_min = 2,
@@ -5799,9 +2483,9 @@ static const struct hda_pcm_stream alc269_44k_pcm_analog_playback = {
        .rates = SNDRV_PCM_RATE_44100, /* fixed rate */
        /* NID is set in alc_build_pcms */
        .ops = {
-               .open = alc_playback_pcm_open,
-               .prepare = alc_playback_pcm_prepare,
-               .cleanup = alc_playback_pcm_cleanup
+               .open = playback_pcm_open,
+               .prepare = playback_pcm_prepare,
+               .cleanup = playback_pcm_cleanup
        },
 };
 
@@ -5909,27 +2593,27 @@ static int alc269_resume(struct hda_codec *codec)
 #endif /* CONFIG_PM */
 
 static void alc269_fixup_pincfg_no_hp_to_lineout(struct hda_codec *codec,
-                                                const struct alc_fixup *fix, int action)
+                                                const struct hda_fixup *fix, int action)
 {
        struct alc_spec *spec = codec->spec;
 
-       if (action == ALC_FIXUP_ACT_PRE_PROBE)
+       if (action == HDA_FIXUP_ACT_PRE_PROBE)
                spec->parse_flags = HDA_PINCFG_NO_HP_FIXUP;
 }
 
 static void alc269_fixup_hweq(struct hda_codec *codec,
-                              const struct alc_fixup *fix, int action)
+                              const struct hda_fixup *fix, int action)
 {
        int coef;
 
-       if (action != ALC_FIXUP_ACT_INIT)
+       if (action != HDA_FIXUP_ACT_INIT)
                return;
        coef = alc_read_coef_idx(codec, 0x1e);
        alc_write_coef_idx(codec, 0x1e, coef | 0x80);
 }
 
 static void alc271_fixup_dmic(struct hda_codec *codec,
-                             const struct alc_fixup *fix, int action)
+                             const struct hda_fixup *fix, int action)
 {
        static const struct hda_verb verbs[] = {
                {0x20, AC_VERB_SET_COEF_INDEX, 0x0d},
@@ -5946,26 +2630,26 @@ static void alc271_fixup_dmic(struct hda_codec *codec,
 }
 
 static void alc269_fixup_pcm_44k(struct hda_codec *codec,
-                                const struct alc_fixup *fix, int action)
+                                const struct hda_fixup *fix, int action)
 {
        struct alc_spec *spec = codec->spec;
 
-       if (action != ALC_FIXUP_ACT_PROBE)
+       if (action != HDA_FIXUP_ACT_PROBE)
                return;
 
        /* Due to a hardware problem on Lenovo Ideadpad, we need to
         * fix the sample rate of analog I/O to 44.1kHz
         */
-       spec->stream_analog_playback = &alc269_44k_pcm_analog_playback;
-       spec->stream_analog_capture = &alc269_44k_pcm_analog_capture;
+       spec->gen.stream_analog_playback = &alc269_44k_pcm_analog_playback;
+       spec->gen.stream_analog_capture = &alc269_44k_pcm_analog_capture;
 }
 
 static void alc269_fixup_stereo_dmic(struct hda_codec *codec,
-                                    const struct alc_fixup *fix, int action)
+                                    const struct hda_fixup *fix, int action)
 {
        int coef;
 
-       if (action != ALC_FIXUP_ACT_INIT)
+       if (action != HDA_FIXUP_ACT_INIT)
                return;
        /* The digital-mic unit sends PDM (differential signal) instead of
         * the standard PCM, thus you can't record a valid mono stream as is.
@@ -5978,7 +2662,7 @@ static void alc269_fixup_stereo_dmic(struct hda_codec *codec,
 
 static void alc269_quanta_automute(struct hda_codec *codec)
 {
-       update_outputs(codec);
+       snd_hda_gen_update_outputs(codec);
 
        snd_hda_codec_write(codec, 0x20, 0,
                        AC_VERB_SET_COEF_INDEX, 0x0c);
@@ -5992,70 +2676,79 @@ static void alc269_quanta_automute(struct hda_codec *codec)
 }
 
 static void alc269_fixup_quanta_mute(struct hda_codec *codec,
-                                    const struct alc_fixup *fix, int action)
+                                    const struct hda_fixup *fix, int action)
 {
        struct alc_spec *spec = codec->spec;
-       if (action != ALC_FIXUP_ACT_PROBE)
+       if (action != HDA_FIXUP_ACT_PROBE)
                return;
-       spec->automute_hook = alc269_quanta_automute;
+       spec->gen.automute_hook = alc269_quanta_automute;
 }
 
-/* update mute-LED according to the speaker mute state via mic1 VREF pin */
-static void alc269_fixup_mic1_mute_hook(void *private_data, int enabled)
+/* update mute-LED according to the speaker mute state via mic VREF pin */
+static void alc269_fixup_mic_mute_hook(void *private_data, int enabled)
 {
        struct hda_codec *codec = private_data;
-       unsigned int pinval = AC_PINCTL_IN_EN + (enabled ?
-                             AC_PINCTL_VREF_HIZ : AC_PINCTL_VREF_80);
-       snd_hda_set_pin_ctl_cache(codec, 0x18, pinval);
+       struct alc_spec *spec = codec->spec;
+       unsigned int pinval;
+
+       if (spec->mute_led_polarity)
+               enabled = !enabled;
+       pinval = AC_PINCTL_IN_EN |
+               (enabled ? AC_PINCTL_VREF_HIZ : AC_PINCTL_VREF_80);
+       if (spec->mute_led_nid)
+               snd_hda_set_pin_ctl_cache(codec, spec->mute_led_nid, pinval);
 }
 
-static void alc269_fixup_mic1_mute(struct hda_codec *codec,
-                                  const struct alc_fixup *fix, int action)
+static void alc269_fixup_hp_mute_led(struct hda_codec *codec,
+                                    const struct hda_fixup *fix, int action)
 {
        struct alc_spec *spec = codec->spec;
-       switch (action) {
-       case ALC_FIXUP_ACT_BUILD:
-               spec->vmaster_mute.hook = alc269_fixup_mic1_mute_hook;
-               snd_hda_add_vmaster_hook(codec, &spec->vmaster_mute, true);
-               /* fallthru */
-       case ALC_FIXUP_ACT_INIT:
-               snd_hda_sync_vmaster_hook(&spec->vmaster_mute);
+       const struct dmi_device *dev = NULL;
+
+       if (action != HDA_FIXUP_ACT_PRE_PROBE)
+               return;
+
+       while ((dev = dmi_find_device(DMI_DEV_TYPE_OEM_STRING, NULL, dev))) {
+               int pol, pin;
+               if (sscanf(dev->name, "HP_Mute_LED_%d_%x", &pol, &pin) != 2)
+                       continue;
+               if (pin < 0x0a || pin >= 0x10)
+                       break;
+               spec->mute_led_polarity = pol;
+               spec->mute_led_nid = pin - 0x0a + 0x18;
+               spec->gen.vmaster_mute.hook = alc269_fixup_mic_mute_hook;
+               spec->gen.vmaster_mute_enum = 1;
+               snd_printd("Detected mute LED for %x:%d\n", spec->mute_led_nid,
+                          spec->mute_led_polarity);
                break;
        }
 }
 
-/* update mute-LED according to the speaker mute state via mic2 VREF pin */
-static void alc269_fixup_mic2_mute_hook(void *private_data, int enabled)
-{
-       struct hda_codec *codec = private_data;
-       unsigned int pinval = enabled ? 0x20 : 0x24;
-       snd_hda_set_pin_ctl_cache(codec, 0x19, pinval);
-}
-
-static void alc269_fixup_mic2_mute(struct hda_codec *codec,
-                                  const struct alc_fixup *fix, int action)
+static void alc269_fixup_hp_mute_led_mic2(struct hda_codec *codec,
+                               const struct hda_fixup *fix, int action)
 {
        struct alc_spec *spec = codec->spec;
-       switch (action) {
-       case ALC_FIXUP_ACT_BUILD:
-               spec->vmaster_mute.hook = alc269_fixup_mic2_mute_hook;
-               snd_hda_add_vmaster_hook(codec, &spec->vmaster_mute, true);
-               /* fallthru */
-       case ALC_FIXUP_ACT_INIT:
-               snd_hda_sync_vmaster_hook(&spec->vmaster_mute);
-               break;
+       if (action == HDA_FIXUP_ACT_PRE_PROBE) {
+               spec->mute_led_polarity = 0;
+               spec->mute_led_nid = 0x19;
+               spec->gen.vmaster_mute.hook = alc269_fixup_mic_mute_hook;
+               spec->gen.vmaster_mute_enum = 1;
        }
 }
 
 static void alc271_hp_gate_mic_jack(struct hda_codec *codec,
-                                   const struct alc_fixup *fix,
+                                   const struct hda_fixup *fix,
                                    int action)
 {
        struct alc_spec *spec = codec->spec;
 
-       if (action == ALC_FIXUP_ACT_PROBE)
-               snd_hda_jack_set_gating_jack(codec, spec->ext_mic_pin,
-                                            spec->autocfg.hp_pins[0]);
+       if (action == HDA_FIXUP_ACT_PROBE) {
+               if (snd_BUG_ON(!spec->gen.am_entry[1].pin ||
+                              !spec->gen.autocfg.hp_pins[0]))
+                       return;
+               snd_hda_jack_set_gating_jack(codec, spec->gen.am_entry[1].pin,
+                                            spec->gen.autocfg.hp_pins[0]);
+       }
 }
 
 enum {
@@ -6075,8 +2768,8 @@ enum {
        ALC269_FIXUP_DMIC,
        ALC269VB_FIXUP_AMIC,
        ALC269VB_FIXUP_DMIC,
-       ALC269_FIXUP_MIC1_MUTE_LED,
-       ALC269_FIXUP_MIC2_MUTE_LED,
+       ALC269_FIXUP_HP_MUTE_LED,
+       ALC269_FIXUP_HP_MUTE_LED_MIC2,
        ALC269_FIXUP_INV_DMIC,
        ALC269_FIXUP_LENOVO_DOCK,
        ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT,
@@ -6084,16 +2777,16 @@ enum {
        ALC271_FIXUP_HP_GATE_MIC_JACK,
 };
 
-static const struct alc_fixup alc269_fixups[] = {
+static const struct hda_fixup alc269_fixups[] = {
        [ALC269_FIXUP_SONY_VAIO] = {
-               .type = ALC_FIXUP_VERBS,
-               .v.verbs = (const struct hda_verb[]) {
-                       {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREFGRD},
+               .type = HDA_FIXUP_PINCTLS,
+               .v.pins = (const struct hda_pintbl[]) {
+                       {0x19, PIN_VREFGRD},
                        {}
                }
        },
        [ALC275_FIXUP_SONY_VAIO_GPIO2] = {
-               .type = ALC_FIXUP_VERBS,
+               .type = HDA_FIXUP_VERBS,
                .v.verbs = (const struct hda_verb[]) {
                        {0x01, AC_VERB_SET_GPIO_MASK, 0x04},
                        {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x04},
@@ -6104,7 +2797,7 @@ static const struct alc_fixup alc269_fixups[] = {
                .chain_id = ALC269_FIXUP_SONY_VAIO
        },
        [ALC269_FIXUP_DELL_M101Z] = {
-               .type = ALC_FIXUP_VERBS,
+               .type = HDA_FIXUP_VERBS,
                .v.verbs = (const struct hda_verb[]) {
                        /* Enables internal speaker */
                        {0x20, AC_VERB_SET_COEF_INDEX, 13},
@@ -6113,50 +2806,50 @@ static const struct alc_fixup alc269_fixups[] = {
                }
        },
        [ALC269_FIXUP_SKU_IGNORE] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc_fixup_sku_ignore,
        },
        [ALC269_FIXUP_ASUS_G73JW] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x17, 0x99130111 }, /* subwoofer */
                        { }
                }
        },
        [ALC269_FIXUP_LENOVO_EAPD] = {
-               .type = ALC_FIXUP_VERBS,
+               .type = HDA_FIXUP_VERBS,
                .v.verbs = (const struct hda_verb[]) {
                        {0x14, AC_VERB_SET_EAPD_BTLENABLE, 0},
                        {}
                }
        },
        [ALC275_FIXUP_SONY_HWEQ] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc269_fixup_hweq,
                .chained = true,
                .chain_id = ALC275_FIXUP_SONY_VAIO_GPIO2
        },
        [ALC271_FIXUP_DMIC] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc271_fixup_dmic,
        },
        [ALC269_FIXUP_PCM_44K] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc269_fixup_pcm_44k,
                .chained = true,
                .chain_id = ALC269_FIXUP_QUANTA_MUTE
        },
        [ALC269_FIXUP_STEREO_DMIC] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc269_fixup_stereo_dmic,
        },
        [ALC269_FIXUP_QUANTA_MUTE] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc269_fixup_quanta_mute,
        },
        [ALC269_FIXUP_LIFEBOOK] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x1a, 0x2101103f }, /* dock line-out */
                        { 0x1b, 0x23a11040 }, /* dock mic-in */
                        { }
@@ -6165,8 +2858,8 @@ static const struct alc_fixup alc269_fixups[] = {
                .chain_id = ALC269_FIXUP_QUANTA_MUTE
        },
        [ALC269_FIXUP_AMIC] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x14, 0x99130110 }, /* speaker */
                        { 0x15, 0x0121401f }, /* HP out */
                        { 0x18, 0x01a19c20 }, /* mic */
@@ -6175,8 +2868,8 @@ static const struct alc_fixup alc269_fixups[] = {
                },
        },
        [ALC269_FIXUP_DMIC] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x12, 0x99a3092f }, /* int-mic */
                        { 0x14, 0x99130110 }, /* speaker */
                        { 0x15, 0x0121401f }, /* HP out */
@@ -6185,8 +2878,8 @@ static const struct alc_fixup alc269_fixups[] = {
                },
        },
        [ALC269VB_FIXUP_AMIC] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x14, 0x99130110 }, /* speaker */
                        { 0x18, 0x01a19c20 }, /* mic */
                        { 0x19, 0x99a3092f }, /* int-mic */
@@ -6195,8 +2888,8 @@ static const struct alc_fixup alc269_fixups[] = {
                },
        },
        [ALC269VB_FIXUP_DMIC] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x12, 0x99a3092f }, /* int-mic */
                        { 0x14, 0x99130110 }, /* speaker */
                        { 0x18, 0x01a19c20 }, /* mic */
@@ -6204,21 +2897,21 @@ static const struct alc_fixup alc269_fixups[] = {
                        { }
                },
        },
-       [ALC269_FIXUP_MIC1_MUTE_LED] = {
-               .type = ALC_FIXUP_FUNC,
-               .v.func = alc269_fixup_mic1_mute,
+       [ALC269_FIXUP_HP_MUTE_LED] = {
+               .type = HDA_FIXUP_FUNC,
+               .v.func = alc269_fixup_hp_mute_led,
        },
-       [ALC269_FIXUP_MIC2_MUTE_LED] = {
-               .type = ALC_FIXUP_FUNC,
-               .v.func = alc269_fixup_mic2_mute,
+       [ALC269_FIXUP_HP_MUTE_LED_MIC2] = {
+               .type = HDA_FIXUP_FUNC,
+               .v.func = alc269_fixup_hp_mute_led_mic2,
        },
        [ALC269_FIXUP_INV_DMIC] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc_fixup_inv_dmic_0x12,
        },
        [ALC269_FIXUP_LENOVO_DOCK] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x19, 0x23a11040 }, /* dock mic */
                        { 0x1b, 0x2121103f }, /* dock headphone */
                        { }
@@ -6227,12 +2920,12 @@ static const struct alc_fixup alc269_fixups[] = {
                .chain_id = ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT
        },
        [ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc269_fixup_pincfg_no_hp_to_lineout,
        },
        [ALC271_FIXUP_AMIC_MIC2] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x14, 0x99130110 }, /* speaker */
                        { 0x19, 0x01a19c20 }, /* mic */
                        { 0x1b, 0x99a7012f }, /* int-mic */
@@ -6241,7 +2934,7 @@ static const struct alc_fixup alc269_fixups[] = {
                },
        },
        [ALC271_FIXUP_HP_GATE_MIC_JACK] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc271_hp_gate_mic_jack,
                .chained = true,
                .chain_id = ALC271_FIXUP_AMIC_MIC2,
@@ -6251,9 +2944,8 @@ static const struct alc_fixup alc269_fixups[] = {
 static const struct snd_pci_quirk alc269_fixup_tbl[] = {
        SND_PCI_QUIRK(0x1025, 0x029b, "Acer 1810TZ", ALC269_FIXUP_INV_DMIC),
        SND_PCI_QUIRK(0x1025, 0x0349, "Acer AOD260", ALC269_FIXUP_INV_DMIC),
-       SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_MIC2_MUTE_LED),
-       SND_PCI_QUIRK(0x103c, 0x1972, "HP Pavilion 17", ALC269_FIXUP_MIC1_MUTE_LED),
-       SND_PCI_QUIRK(0x103c, 0x1977, "HP Pavilion 14", ALC269_FIXUP_MIC1_MUTE_LED),
+       SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),
+       SND_PCI_QUIRK_VENDOR(0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED),
        SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_DMIC),
        SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_DMIC),
        SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW),
@@ -6336,7 +3028,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
        {}
 };
 
-static const struct alc_model_fixup alc269_fixup_models[] = {
+static const struct hda_model_fixup alc269_fixup_models[] = {
        {.id = ALC269_FIXUP_AMIC, .name = "laptop-amic"},
        {.id = ALC269_FIXUP_DMIC, .name = "laptop-dmic"},
        {.id = ALC269_FIXUP_STEREO_DMIC, .name = "alc269-dmic"},
@@ -6403,10 +3095,11 @@ static int patch_alc269(struct hda_codec *codec)
                return err;
 
        spec = codec->spec;
+       spec->gen.shared_mic_vref_pin = 0x18;
 
-       alc_pick_fixup(codec, alc269_fixup_models,
+       snd_hda_pick_fixup(codec, alc269_fixup_models,
                       alc269_fixup_tbl, alc269_fixups);
-       alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
+       snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
 
        alc_auto_parse_customize_define(codec);
 
@@ -6457,7 +3150,7 @@ static int patch_alc269(struct hda_codec *codec)
        if (err < 0)
                goto error;
 
-       if (!spec->no_analog && has_cdefine_beep(codec)) {
+       if (!spec->gen.no_analog && has_cdefine_beep(codec)) {
                err = snd_hda_attach_beep_device(codec, 0x1);
                if (err < 0)
                        goto error;
@@ -6470,7 +3163,7 @@ static int patch_alc269(struct hda_codec *codec)
 #endif
        spec->shutup = alc269_shutup;
 
-       alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE);
+       snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);
 
        return 0;
 
@@ -6500,49 +3193,48 @@ enum {
 
 /* On some laptops, VREF of pin 0x0f is abused for controlling the main amp */
 static void alc861_fixup_asus_amp_vref_0f(struct hda_codec *codec,
-                       const struct alc_fixup *fix, int action)
+                       const struct hda_fixup *fix, int action)
 {
        struct alc_spec *spec = codec->spec;
        unsigned int val;
 
-       if (action != ALC_FIXUP_ACT_INIT)
+       if (action != HDA_FIXUP_ACT_INIT)
                return;
-       val = snd_hda_codec_read(codec, 0x0f, 0,
-                                AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
+       val = snd_hda_codec_get_pin_target(codec, 0x0f);
        if (!(val & (AC_PINCTL_IN_EN | AC_PINCTL_OUT_EN)))
                val |= AC_PINCTL_IN_EN;
        val |= AC_PINCTL_VREF_50;
        snd_hda_set_pin_ctl(codec, 0x0f, val);
-       spec->keep_vref_in_automute = 1;
+       spec->gen.keep_vref_in_automute = 1;
 }
 
 /* suppress the jack-detection */
 static void alc_fixup_no_jack_detect(struct hda_codec *codec,
-                                    const struct alc_fixup *fix, int action)
+                                    const struct hda_fixup *fix, int action)
 {
-       if (action == ALC_FIXUP_ACT_PRE_PROBE)
+       if (action == HDA_FIXUP_ACT_PRE_PROBE)
                codec->no_jack_detect = 1;
 }
 
-static const struct alc_fixup alc861_fixups[] = {
+static const struct hda_fixup alc861_fixups[] = {
        [ALC861_FIXUP_FSC_AMILO_PI1505] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x0b, 0x0221101f }, /* HP */
                        { 0x0f, 0x90170310 }, /* speaker */
                        { }
                }
        },
        [ALC861_FIXUP_AMP_VREF_0F] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc861_fixup_asus_amp_vref_0f,
        },
        [ALC861_FIXUP_NO_JACK_DETECT] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc_fixup_no_jack_detect,
        },
        [ALC861_FIXUP_ASUS_A6RP] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc861_fixup_asus_amp_vref_0f,
                .chained = true,
                .chain_id = ALC861_FIXUP_NO_JACK_DETECT,
@@ -6572,15 +3264,15 @@ static int patch_alc861(struct hda_codec *codec)
 
        spec = codec->spec;
 
-       alc_pick_fixup(codec, NULL, alc861_fixup_tbl, alc861_fixups);
-       alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
+       snd_hda_pick_fixup(codec, NULL, alc861_fixup_tbl, alc861_fixups);
+       snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
 
        /* automatic parse from the BIOS config */
        err = alc861_parse_auto_config(codec);
        if (err < 0)
                goto error;
 
-       if (!spec->no_analog) {
+       if (!spec->gen.no_analog) {
                err = snd_hda_attach_beep_device(codec, 0x23);
                if (err < 0)
                        goto error;
@@ -6592,7 +3284,7 @@ static int patch_alc861(struct hda_codec *codec)
        spec->power_hook = alc_power_eapd;
 #endif
 
-       alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE);
+       snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);
 
        return 0;
 
@@ -6622,17 +3314,17 @@ enum {
 
 /* exclude VREF80 */
 static void alc861vd_fixup_dallas(struct hda_codec *codec,
-                                 const struct alc_fixup *fix, int action)
+                                 const struct hda_fixup *fix, int action)
 {
-       if (action == ALC_FIXUP_ACT_PRE_PROBE) {
+       if (action == HDA_FIXUP_ACT_PRE_PROBE) {
                snd_hda_override_pin_caps(codec, 0x18, 0x00000734);
                snd_hda_override_pin_caps(codec, 0x19, 0x0000073c);
        }
 }
 
-static const struct alc_fixup alc861vd_fixups[] = {
+static const struct hda_fixup alc861vd_fixups[] = {
        [ALC660VD_FIX_ASUS_GPIO1] = {
-               .type = ALC_FIXUP_VERBS,
+               .type = HDA_FIXUP_VERBS,
                .v.verbs = (const struct hda_verb[]) {
                        /* reset GPIO1 */
                        {0x01, AC_VERB_SET_GPIO_MASK, 0x03},
@@ -6642,7 +3334,7 @@ static const struct alc_fixup alc861vd_fixups[] = {
                }
        },
        [ALC861VD_FIX_DALLAS] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc861vd_fixup_dallas,
        },
 };
@@ -6667,15 +3359,15 @@ static int patch_alc861vd(struct hda_codec *codec)
 
        spec = codec->spec;
 
-       alc_pick_fixup(codec, NULL, alc861vd_fixup_tbl, alc861vd_fixups);
-       alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
+       snd_hda_pick_fixup(codec, NULL, alc861vd_fixup_tbl, alc861vd_fixups);
+       snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
 
        /* automatic parse from the BIOS config */
        err = alc861vd_parse_auto_config(codec);
        if (err < 0)
                goto error;
 
-       if (!spec->no_analog) {
+       if (!spec->gen.no_analog) {
                err = snd_hda_attach_beep_device(codec, 0x23);
                if (err < 0)
                        goto error;
@@ -6686,7 +3378,7 @@ static int patch_alc861vd(struct hda_codec *codec)
 
        spec->shutup = alc_eapd_shutup;
 
-       alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE);
+       snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);
 
        return 0;
 
@@ -6727,9 +3419,9 @@ static int alc662_parse_auto_config(struct hda_codec *codec)
 }
 
 static void alc272_fixup_mario(struct hda_codec *codec,
-                              const struct alc_fixup *fix, int action)
+                              const struct hda_fixup *fix, int action)
 {
-       if (action != ALC_FIXUP_ACT_PROBE)
+       if (action != HDA_FIXUP_ACT_PRE_PROBE)
                return;
        if (snd_hda_override_amp_caps(codec, 0x2, HDA_OUTPUT,
                                      (0x3b << AC_AMPCAP_OFFSET_SHIFT) |
@@ -6760,39 +3452,39 @@ enum {
        ALC662_FIXUP_INV_DMIC,
 };
 
-static const struct alc_fixup alc662_fixups[] = {
+static const struct hda_fixup alc662_fixups[] = {
        [ALC662_FIXUP_ASPIRE] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x15, 0x99130112 }, /* subwoofer */
                        { }
                }
        },
        [ALC662_FIXUP_IDEAPAD] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x17, 0x99130112 }, /* subwoofer */
                        { }
                }
        },
        [ALC272_FIXUP_MARIO] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc272_fixup_mario,
        },
        [ALC662_FIXUP_CZC_P10T] = {
-               .type = ALC_FIXUP_VERBS,
+               .type = HDA_FIXUP_VERBS,
                .v.verbs = (const struct hda_verb[]) {
                        {0x14, AC_VERB_SET_EAPD_BTLENABLE, 0},
                        {}
                }
        },
        [ALC662_FIXUP_SKU_IGNORE] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc_fixup_sku_ignore,
        },
        [ALC662_FIXUP_HP_RP5800] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x14, 0x0221201f }, /* HP out */
                        { }
                },
@@ -6800,8 +3492,8 @@ static const struct alc_fixup alc662_fixups[] = {
                .chain_id = ALC662_FIXUP_SKU_IGNORE
        },
        [ALC662_FIXUP_ASUS_MODE1] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x14, 0x99130110 }, /* speaker */
                        { 0x18, 0x01a19c20 }, /* mic */
                        { 0x19, 0x99a3092f }, /* int-mic */
@@ -6812,8 +3504,8 @@ static const struct alc_fixup alc662_fixups[] = {
                .chain_id = ALC662_FIXUP_SKU_IGNORE
        },
        [ALC662_FIXUP_ASUS_MODE2] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x14, 0x99130110 }, /* speaker */
                        { 0x18, 0x01a19820 }, /* mic */
                        { 0x19, 0x99a3092f }, /* int-mic */
@@ -6824,8 +3516,8 @@ static const struct alc_fixup alc662_fixups[] = {
                .chain_id = ALC662_FIXUP_SKU_IGNORE
        },
        [ALC662_FIXUP_ASUS_MODE3] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x14, 0x99130110 }, /* speaker */
                        { 0x15, 0x0121441f }, /* HP */
                        { 0x18, 0x01a19840 }, /* mic */
@@ -6837,8 +3529,8 @@ static const struct alc_fixup alc662_fixups[] = {
                .chain_id = ALC662_FIXUP_SKU_IGNORE
        },
        [ALC662_FIXUP_ASUS_MODE4] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x14, 0x99130110 }, /* speaker */
                        { 0x16, 0x99130111 }, /* speaker */
                        { 0x18, 0x01a19840 }, /* mic */
@@ -6850,8 +3542,8 @@ static const struct alc_fixup alc662_fixups[] = {
                .chain_id = ALC662_FIXUP_SKU_IGNORE
        },
        [ALC662_FIXUP_ASUS_MODE5] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x14, 0x99130110 }, /* speaker */
                        { 0x15, 0x0121441f }, /* HP */
                        { 0x16, 0x99130111 }, /* speaker */
@@ -6863,8 +3555,8 @@ static const struct alc_fixup alc662_fixups[] = {
                .chain_id = ALC662_FIXUP_SKU_IGNORE
        },
        [ALC662_FIXUP_ASUS_MODE6] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x14, 0x99130110 }, /* speaker */
                        { 0x15, 0x01211420 }, /* HP2 */
                        { 0x18, 0x01a19840 }, /* mic */
@@ -6876,8 +3568,8 @@ static const struct alc_fixup alc662_fixups[] = {
                .chain_id = ALC662_FIXUP_SKU_IGNORE
        },
        [ALC662_FIXUP_ASUS_MODE7] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x14, 0x99130110 }, /* speaker */
                        { 0x17, 0x99130111 }, /* speaker */
                        { 0x18, 0x01a19840 }, /* mic */
@@ -6890,8 +3582,8 @@ static const struct alc_fixup alc662_fixups[] = {
                .chain_id = ALC662_FIXUP_SKU_IGNORE
        },
        [ALC662_FIXUP_ASUS_MODE8] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x14, 0x99130110 }, /* speaker */
                        { 0x12, 0x99a30970 }, /* int-mic */
                        { 0x15, 0x01214020 }, /* HP */
@@ -6904,18 +3596,18 @@ static const struct alc_fixup alc662_fixups[] = {
                .chain_id = ALC662_FIXUP_SKU_IGNORE
        },
        [ALC662_FIXUP_NO_JACK_DETECT] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc_fixup_no_jack_detect,
        },
        [ALC662_FIXUP_ZOTAC_Z68] = {
-               .type = ALC_FIXUP_PINS,
-               .v.pins = (const struct alc_pincfg[]) {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
                        { 0x1b, 0x02214020 }, /* Front HP */
                        { }
                }
        },
        [ALC662_FIXUP_INV_DMIC] = {
-               .type = ALC_FIXUP_FUNC,
+               .type = HDA_FIXUP_FUNC,
                .v.func = alc_fixup_inv_dmic_0x12,
        },
 };
@@ -6995,7 +3687,7 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = {
        {}
 };
 
-static const struct alc_model_fixup alc662_fixup_models[] = {
+static const struct hda_model_fixup alc662_fixup_models[] = {
        {.id = ALC272_FIXUP_MARIO, .name = "mario"},
        {.id = ALC662_FIXUP_ASUS_MODE1, .name = "asus-mode1"},
        {.id = ALC662_FIXUP_ASUS_MODE2, .name = "asus-mode2"},
@@ -7056,9 +3748,9 @@ static int patch_alc662(struct hda_codec *codec)
        spec->init_hook = alc662_fill_coef;
        alc662_fill_coef(codec);
 
-       alc_pick_fixup(codec, alc662_fixup_models,
+       snd_hda_pick_fixup(codec, alc662_fixup_models,
                       alc662_fixup_tbl, alc662_fixups);
-       alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
+       snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
 
        alc_auto_parse_customize_define(codec);
 
@@ -7074,7 +3766,7 @@ static int patch_alc662(struct hda_codec *codec)
        if (err < 0)
                goto error;
 
-       if (!spec->no_analog && has_cdefine_beep(codec)) {
+       if (!spec->gen.no_analog && has_cdefine_beep(codec)) {
                err = snd_hda_attach_beep_device(codec, 0x1);
                if (err < 0)
                        goto error;
@@ -7096,7 +3788,7 @@ static int patch_alc662(struct hda_codec *codec)
        codec->patch_ops = alc_patch_ops;
        spec->shutup = alc_eapd_shutup;
 
-       alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE);
+       snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);
 
        return 0;