Merge branch 'for-2.6.32' into for-2.6.33

1 files changed, 73 insertions, 25 deletions

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 7810d3dcad83..ff20048504b6 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -275,7 +275,7 @@ struct alc_spec {
         struct snd_kcontrol_new *cap_mixer;     /* capture mixer */
         unsigned int beep_amp;  /* beep amp value, set via set_beep_amp() */
 
-        const struct hda_verb *init_verbs[5];   /* initialization verbs
+        const struct hda_verb *init_verbs[10];  /* initialization verbs
                                                  * don't forget NULL
                                                  * termination!
                                                  */
@@ -965,6 +965,8 @@ static void alc_automute_pin(struct hda_codec *codec)
         unsigned int nid = spec->autocfg.hp_pins[0];
         int i;
 
+        if (!nid)
+                return;
         pincap = snd_hda_query_pin_caps(codec, nid);
         if (pincap & AC_PINCAP_TRIG_REQ) /* need trigger? */
                 snd_hda_codec_read(codec, nid, 0, AC_VERB_SET_PIN_SENSE, 0);
@@ -1332,15 +1334,20 @@ do_sku:
          *              when the external headphone out jack is plugged"
          */
         if (!spec->autocfg.hp_pins[0]) {
+                hda_nid_t nid;
                 tmp = (ass >> 11) & 0x3;        /* HP to chassis */
                 if (tmp == 0)
-                        spec->autocfg.hp_pins[0] = porta;
+                        nid = porta;
                 else if (tmp == 1)
-                        spec->autocfg.hp_pins[0] = porte;
+                        nid = porte;
                 else if (tmp == 2)
-                        spec->autocfg.hp_pins[0] = portd;
+                        nid = portd;
                 else
                         return 1;
+                for (i = 0; i < spec->autocfg.line_outs; i++)
+                        if (spec->autocfg.line_out_pins[i] == nid)
+                                return 1;
+                spec->autocfg.hp_pins[0] = nid;
         }
 
         alc_init_auto_hp(codec);
@@ -1362,7 +1369,7 @@ static void alc_ssid_check(struct hda_codec *codec,
 }
 
 /*
- * Fix-up pin default configurations
+ * Fix-up pin default configurations and add default verbs
  */
 
 struct alc_pincfg {
@@ -1370,9 +1377,14 @@ struct alc_pincfg {
         u32 val;
 };
 
-static void alc_fix_pincfg(struct hda_codec *codec,
+struct alc_fixup {
+        const struct alc_pincfg *pins;
+        const struct hda_verb *verbs;
+};
+
+static void alc_pick_fixup(struct hda_codec *codec,
                            const struct snd_pci_quirk *quirk,
-                           const struct alc_pincfg **pinfix)
+                           const struct alc_fixup *fix)
 {
         const struct alc_pincfg *cfg;
 
@@ -1380,9 +1392,14 @@ static void alc_fix_pincfg(struct hda_codec *codec,
         if (!quirk)
                 return;
 
-        cfg = pinfix[quirk->value];
-        for (; cfg->nid; cfg++)
-                snd_hda_codec_set_pincfg(codec, cfg->nid, cfg->val);
+        fix += quirk->value;
+        cfg = fix->pins;
+        if (cfg) {
+                for (; cfg->nid; cfg++)
+                        snd_hda_codec_set_pincfg(codec, cfg->nid, cfg->val);
+        }
+        if (fix->verbs)
+                add_verb(codec->spec, fix->verbs);
 }
 
 /*
@@ -9593,11 +9610,13 @@ static struct alc_pincfg alc882_abit_aw9d_pinfix[] = {
         { }
 };
 
-static const struct alc_pincfg *alc882_pin_fixes[] = {
-        [PINFIX_ABIT_AW9D_MAX] = alc882_abit_aw9d_pinfix,
+static const struct alc_fixup alc882_fixups[] = {
+        [PINFIX_ABIT_AW9D_MAX] = {
+                .pins = alc882_abit_aw9d_pinfix
+        },
 };
 
-static struct snd_pci_quirk alc882_pinfix_tbl[] = {
+static struct snd_pci_quirk alc882_fixup_tbl[] = {
         SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", PINFIX_ABIT_AW9D_MAX),
         {}
 };
@@ -9869,7 +9888,7 @@ static int patch_alc882(struct hda_codec *codec)
                 board_config = ALC882_AUTO;
         }
 
-        alc_fix_pincfg(codec, alc882_pinfix_tbl, alc882_pin_fixes);
+        alc_pick_fixup(codec, alc882_fixup_tbl, alc882_fixups);
 
         if (board_config == ALC882_AUTO) {
                 /* automatic parse from the BIOS config */
@@ -12585,7 +12604,8 @@ static struct snd_pci_quirk alc268_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1025, 0x015b, "Acer Aspire One",
                                                 ALC268_ACER_ASPIRE_ONE),
         SND_PCI_QUIRK(0x1028, 0x0253, "Dell OEM", ALC268_DELL),
-        SND_PCI_QUIRK(0x1028, 0x02b0, "Dell Inspiron Mini9", ALC268_DELL),
+        SND_PCI_QUIRK_MASK(0x1028, 0xfff0, 0x02b0,
+                        "Dell Inspiron Mini9/Vostro A90", ALC268_DELL),
         /* almost compatible with toshiba but with optional digital outs;
          * auto-probing seems working fine
          */
@@ -12842,12 +12862,15 @@ static int patch_alc268(struct hda_codec *codec)
                 unsigned int wcap = get_wcaps(codec, 0x07);
                 int i;
 
+                spec->capsrc_nids = alc268_capsrc_nids;
                 /* get type */
                 wcap = get_wcaps_type(wcap);
                 if (spec->auto_mic ||
                     wcap != AC_WID_AUD_IN || spec->input_mux->num_items == 1) {
                         spec->adc_nids = alc268_adc_nids_alt;
                         spec->num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt);
+                        if (spec->auto_mic)
+                                fixup_automic_adc(codec);
                         if (spec->auto_mic || spec->input_mux->num_items == 1)
                                 add_mixer(spec, alc268_capture_nosrc_mixer);
                         else
@@ -12857,7 +12880,6 @@ static int patch_alc268(struct hda_codec *codec)
                         spec->num_adc_nids = ARRAY_SIZE(alc268_adc_nids);
                         add_mixer(spec, alc268_capture_mixer);
                 }
-                spec->capsrc_nids = alc268_capsrc_nids;
                 /* set default input source */
                 for (i = 0; i < spec->num_adc_nids; i++)
                         snd_hda_codec_write_cache(codec, alc268_capsrc_nids[i],
@@ -14357,15 +14379,16 @@ static void alc861_auto_init_multi_out(struct hda_codec *codec)
 static void alc861_auto_init_hp_out(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
-        hda_nid_t pin;
 
-        pin = spec->autocfg.hp_pins[0];
-        if (pin)
-                alc861_auto_set_output_and_unmute(codec, pin, PIN_HP,
+        if (spec->autocfg.hp_outs)
+                alc861_auto_set_output_and_unmute(codec,
+                                                  spec->autocfg.hp_pins[0],
+                                                  PIN_HP,
                                                   spec->multiout.hp_nid);
-        pin = spec->autocfg.speaker_pins[0];
-        if (pin)
-                alc861_auto_set_output_and_unmute(codec, pin, PIN_OUT,
+        if (spec->autocfg.speaker_outs)
+                alc861_auto_set_output_and_unmute(codec,
+                                                  spec->autocfg.speaker_pins[0],
+                                                  PIN_OUT,
                                                   spec->multiout.dac_nids[0]);
 }
 
@@ -15158,7 +15181,7 @@ static struct snd_pci_quirk alc861vd_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1019, 0xa88d, "Realtek ALC660 demo", ALC660VD_3ST),
         SND_PCI_QUIRK(0x103c, 0x30bf, "HP TX1000", ALC861VD_HP),
         SND_PCI_QUIRK(0x1043, 0x12e2, "Asus z35m", ALC660VD_3ST),
-        SND_PCI_QUIRK(0x1043, 0x1339, "Asus G1", ALC660VD_3ST),
+        /*SND_PCI_QUIRK(0x1043, 0x1339, "Asus G1", ALC660VD_3ST),*/ /* auto */
         SND_PCI_QUIRK(0x1043, 0x1633, "Asus V1Sn", ALC660VD_ASUS_V1S),
         SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS", ALC660VD_3ST_DIG),
         SND_PCI_QUIRK(0x10de, 0x03f0, "Realtek ALC660 demo", ALC660VD_3ST),
@@ -15551,6 +15574,29 @@ static void alc861vd_auto_init(struct hda_codec *codec)
                 alc_inithook(codec);
 }
 
+enum {
+        ALC660VD_FIX_ASUS_GPIO1
+};
+
+/* reset GPIO1 */
+static const struct hda_verb alc660vd_fix_asus_gpio1_verbs[] = {
+        {0x01, AC_VERB_SET_GPIO_MASK, 0x03},
+        {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x01},
+        {0x01, AC_VERB_SET_GPIO_DATA, 0x01},
+        { }
+};
+
+static const struct alc_fixup alc861vd_fixups[] = {
+        [ALC660VD_FIX_ASUS_GPIO1] = {
+                .verbs = alc660vd_fix_asus_gpio1_verbs,
+        },
+};
+
+static struct snd_pci_quirk alc861vd_fixup_tbl[] = {
+        SND_PCI_QUIRK(0x1043, 0x1339, "ASUS A7-K", ALC660VD_FIX_ASUS_GPIO1),
+        {}
+};
+
 static int patch_alc861vd(struct hda_codec *codec)
 {
         struct alc_spec *spec;
@@ -15572,6 +15618,8 @@ static int patch_alc861vd(struct hda_codec *codec)
                 board_config = ALC861VD_AUTO;
         }
 
+        alc_pick_fixup(codec, alc861vd_fixup_tbl, alc861vd_fixups);
+
         if (board_config == ALC861VD_AUTO) {
                 /* automatic parse from the BIOS config */
                 err = alc861vd_parse_auto_config(codec);
@@ -17329,7 +17377,7 @@ static int alc662_auto_create_extra_out(struct hda_codec *codec, hda_nid_t pin,
 
 /* create playback/capture controls for input pins */
 #define alc662_auto_create_input_ctls \
-        alc880_auto_create_input_ctls
+        alc882_auto_create_input_ctls
 
 static void alc662_auto_set_output_and_unmute(struct hda_codec *codec,
                                               hda_nid_t nid, int pin_type,