2 files changed, 37 insertions, 8 deletions

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 4eceab9bd109..a4666c96a44f 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -829,6 +829,7 @@ static void alc_sku_automute(struct hda_codec *codec)
                             spec->jack_present ? 0 : PIN_OUT);
 }
 
+#if 0 /* it's broken in some acses -- temporarily disabled */
 static void alc_mic_automute(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
@@ -849,6 +850,9 @@ static void alc_mic_automute(struct hda_codec *codec)
         snd_hda_codec_amp_stereo(codec, 0x0b, HDA_INPUT, capsrc_idx_fmic,
                          HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
 }
+#else
+#define alc_mic_automute(codec) /* NOP */
+#endif /* disabled */
 
 /* unsolicited event for HP jack sensing */
 static void alc_sku_unsol_event(struct hda_codec *codec, unsigned int res)
@@ -1058,12 +1062,14 @@ do_sku:
                         AC_VERB_SET_UNSOLICITED_ENABLE,
                         AC_USRSP_EN | ALC880_HP_EVENT);
 
+#if 0 /* it's broken in some acses -- temporarily disabled */
         if (spec->autocfg.input_pins[AUTO_PIN_MIC] &&
                 spec->autocfg.input_pins[AUTO_PIN_FRONT_MIC])
                 snd_hda_codec_write(codec,
                         spec->autocfg.input_pins[AUTO_PIN_MIC], 0,
                         AC_VERB_SET_UNSOLICITED_ENABLE,
                         AC_USRSP_EN | ALC880_MIC_EVENT);
+#endif /* disabled */
 
         spec->unsol_event = alc_sku_unsol_event;
 }
@@ -8408,6 +8414,7 @@ static const char *alc883_models[ALC883_MODEL_LAST] = {
 static struct snd_pci_quirk alc883_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1019, 0x6668, "ECS", ALC883_3ST_6ch_DIG),
         SND_PCI_QUIRK(0x1025, 0x006c, "Acer Aspire 9810", ALC883_ACER_ASPIRE),
+        SND_PCI_QUIRK(0x1025, 0x0090, "Acer Aspire", ALC883_ACER_ASPIRE),
         SND_PCI_QUIRK(0x1025, 0x0110, "Acer Aspire", ALC883_ACER_ASPIRE),
         SND_PCI_QUIRK(0x1025, 0x0112, "Acer Aspire 9303", ALC883_ACER_ASPIRE),
         SND_PCI_QUIRK(0x1025, 0x0121, "Acer Aspire 5920G", ALC883_ACER_ASPIRE),
@@ -12238,8 +12245,26 @@ static int alc269_auto_create_multi_out_ctls(struct alc_spec *spec,
         return 0;
 }
 
-#define alc269_auto_create_analog_input_ctls \
-        alc880_auto_create_analog_input_ctls
+static int alc269_auto_create_analog_input_ctls(struct alc_spec *spec,
+                                                const struct auto_pin_cfg *cfg)
+{
+        int err;
+
+        err = alc880_auto_create_analog_input_ctls(spec, cfg);
+        if (err < 0)
+                return err;
+        /* digital-mic input pin is excluded in alc880_auto_create..()
+         * because it's under 0x18
+         */
+        if (cfg->input_pins[AUTO_PIN_MIC] == 0x12 ||
+            cfg->input_pins[AUTO_PIN_FRONT_MIC] == 0x12) {
+                struct hda_input_mux *imux = &spec->private_imux;
+                imux->items[imux->num_items].label = "Int Mic";
+                imux->items[imux->num_items].index = 0x05;
+                imux->num_items++;
+        }
+        return 0;
+}
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
 #define alc269_loopbacks        alc880_loopbacks
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index df9b0bc7f878..e6085915d86d 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -69,6 +69,7 @@ enum {
 enum {
         STAC_92HD73XX_REF,
         STAC_DELL_M6,
+        STAC_DELL_EQ,
         STAC_92HD73XX_MODELS
 };
 
@@ -773,9 +774,7 @@ static struct hda_verb dell_eq_core_init[] = {
 };
 
 static struct hda_verb dell_m6_core_init[] = {
-        /* set master volume to max value without distortion
-         * and direct control */
-        { 0x1f, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xec},
+        { 0x1f, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
         /* setup audio connections */
         { 0x0d, AC_VERB_SET_CONNECT_SEL, 0x00},
         { 0x0a, AC_VERB_SET_CONNECT_SEL, 0x01},
@@ -1600,11 +1599,13 @@ static unsigned int dell_m6_pin_configs[13] = {
 static unsigned int *stac92hd73xx_brd_tbl[STAC_92HD73XX_MODELS] = {
         [STAC_92HD73XX_REF]     = ref92hd73xx_pin_configs,
         [STAC_DELL_M6]  = dell_m6_pin_configs,
+        [STAC_DELL_EQ]  = dell_m6_pin_configs,
 };
 
 static const char *stac92hd73xx_models[STAC_92HD73XX_MODELS] = {
         [STAC_92HD73XX_REF] = "ref",
         [STAC_DELL_M6] = "dell-m6",
+        [STAC_DELL_EQ] = "dell-eq",
 };
 
 static struct snd_pci_quirk stac92hd73xx_cfg_tbl[] = {
@@ -4131,12 +4132,17 @@ again:
                         sizeof(stac92hd73xx_dmux));
 
         switch (spec->board_config) {
-        case STAC_DELL_M6:
+        case STAC_DELL_EQ:
                 spec->init = dell_eq_core_init;
+                /* fallthru */
+        case STAC_DELL_M6:
                 spec->num_smuxes = 0;
                 spec->mixer = &stac92hd73xx_6ch_mixer[DELL_M6_MIXER];
                 spec->amp_nids = &stac92hd73xx_amp_nids[DELL_M6_AMP];
                 spec->num_amps = 1;
+
+                if (!spec->init)
+                        spec->init = dell_m6_core_init;
                 switch (codec->subsystem_id) {
                 case 0x1028025e: /* Analog Mics */
                 case 0x1028025f:
@@ -4146,8 +4152,6 @@ again:
                         break;
                 case 0x10280271: /* Digital Mics */
                 case 0x10280272:
-                        spec->init = dell_m6_core_init;
-                        /* fall-through */
                 case 0x10280254:
                 case 0x10280255:
                         stac92xx_set_config_reg(codec, 0x13, 0x90A60160);