4 files changed, 157 insertions, 46 deletions

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 0e76ac2b2ace..d1424e7b9f3d 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -1461,6 +1461,8 @@ int snd_hda_codec_amp_update(struct hda_codec *codec, hda_nid_t nid, int ch,
         info = get_alloc_amp_hash(codec, HDA_HASH_KEY(nid, direction, idx));
         if (!info)
                 return 0;
+        if (snd_BUG_ON(mask & ~0xff))
+                mask &= 0xff;
         val &= mask;
         val |= get_vol_mute(codec, info, nid, ch, direction, idx) & ~mask;
         if (info->vol[ch] == val)
@@ -1486,6 +1488,9 @@ int snd_hda_codec_amp_stereo(struct hda_codec *codec, hda_nid_t nid,
                              int direction, int idx, int mask, int val)
 {
         int ch, ret = 0;
+
+        if (snd_BUG_ON(mask & ~0xff))
+                mask &= 0xff;
         for (ch = 0; ch < 2; ch++)
                 ret |= snd_hda_codec_amp_update(codec, nid, ch, direction,
                                                 idx, mask, val);
@@ -4218,7 +4223,8 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec,
                         break;
                 case AC_JACK_MIC_IN: {
                         int preferred, alt;
-                        if (loc == AC_JACK_LOC_FRONT) {
+                        if (loc == AC_JACK_LOC_FRONT ||
+                            (loc & 0x30) == AC_JACK_LOC_INTERNAL) {
                                 preferred = AUTO_PIN_FRONT_MIC;
                                 alt = AUTO_PIN_MIC;
                         } else {
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 4bb90675f70f..b185afd581f1 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -84,7 +84,7 @@ module_param_array(bdl_pos_adj, int, NULL, 0644);
 MODULE_PARM_DESC(bdl_pos_adj, "BDL position adjustment offset.");
 module_param_array(probe_mask, int, NULL, 0444);
 MODULE_PARM_DESC(probe_mask, "Bitmask to probe codecs (default = -1).");
-module_param_array(probe_only, bool, NULL, 0444);
+module_param_array(probe_only, int, NULL, 0444);
 MODULE_PARM_DESC(probe_only, "Only probing and no codec initialization.");
 module_param(single_cmd, bool, 0444);
 MODULE_PARM_DESC(single_cmd, "Use single command to communicate with codecs "
@@ -858,10 +858,13 @@ static void azx_power_notify(struct hda_bus *bus);
 #endif
 
 /* reset codec link */
-static int azx_reset(struct azx *chip)
+static int azx_reset(struct azx *chip, int full_reset)
 {
         int count;
 
+        if (!full_reset)
+                goto __skip;
+
         /* clear STATESTS */
         azx_writeb(chip, STATESTS, STATESTS_INT_MASK);
 
@@ -887,6 +890,7 @@ static int azx_reset(struct azx *chip)
         /* Brent Chartrand said to wait >= 540us for codecs to initialize */
         msleep(1);
 
+      __skip:
         /* check to see if controller is ready */
         if (!azx_readb(chip, GCTL)) {
                 snd_printd(SFX "azx_reset: controller not ready!\n");
@@ -998,13 +1002,13 @@ static void azx_stream_stop(struct azx *chip, struct azx_dev *azx_dev)
 /*
  * reset and start the controller registers
  */
-static void azx_init_chip(struct azx *chip)
+static void azx_init_chip(struct azx *chip, int full_reset)
 {
         if (chip->initialized)
                 return;
 
         /* reset controller */
-        azx_reset(chip);
+        azx_reset(chip, full_reset);
 
         /* initialize interrupts */
         azx_int_clear(chip);
@@ -1348,7 +1352,7 @@ static void azx_bus_reset(struct hda_bus *bus)
 
         bus->in_reset = 1;
         azx_stop_chip(chip);
-        azx_init_chip(chip);
+        azx_init_chip(chip, 1);
 #ifdef CONFIG_PM
         if (chip->initialized) {
                 int i;
@@ -1422,7 +1426,7 @@ static int __devinit azx_codec_create(struct azx *chip, const char *model)
                                  * get back to the sanity state.
                                  */
                                 azx_stop_chip(chip);
-                                azx_init_chip(chip);
+                                azx_init_chip(chip, 1);
                         }
                 }
         }
@@ -2112,7 +2116,7 @@ static void azx_power_notify(struct hda_bus *bus)
                 }
         }
         if (power_on)
-                azx_init_chip(chip);
+                azx_init_chip(chip, 1);
         else if (chip->running && power_save_controller &&
                  !bus->power_keep_link_on)
                 azx_stop_chip(chip);
@@ -2182,7 +2186,7 @@ static int azx_resume(struct pci_dev *pci)
         azx_init_pci(chip);
 
         if (snd_hda_codecs_inuse(chip->bus))
-                azx_init_chip(chip);
+                azx_init_chip(chip, 1);
 
         snd_hda_resume(chip->bus);
         snd_power_change_state(card, SNDRV_CTL_POWER_D0);
@@ -2574,7 +2578,7 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
 
         /* initialize chip */
         azx_init_pci(chip);
-        azx_init_chip(chip);
+        azx_init_chip(chip, (probe_only[dev] & 2) == 0);
 
         /* codec detection */
         if (!chip->codec_mask) {
@@ -2663,7 +2667,7 @@ static int __devinit azx_probe(struct pci_dev *pci,
                         goto out_free;
         }
 #endif
-        if (!probe_only[dev]) {
+        if ((probe_only[dev] & 1) == 0) {
                 err = azx_codec_configure(chip);
                 if (err < 0)
                         goto out_free;
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index e6d1bdff1b6e..262f5b5decf1 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -71,9 +71,10 @@ struct ad198x_spec {
         struct hda_input_mux private_imux;
         hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS];
 
-        unsigned int jack_present :1;
-        unsigned int inv_jack_detect:1; /* inverted jack-detection */
-        unsigned int inv_eapd:1;        /* inverted EAPD implementation */
+        unsigned int jack_present: 1;
+        unsigned int inv_jack_detect: 1;/* inverted jack-detection */
+        unsigned int inv_eapd: 1;       /* inverted EAPD implementation */
+        unsigned int analog_beep: 1;    /* analog beep input present */
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         struct hda_loopback_check loopback;
@@ -165,6 +166,12 @@ static struct snd_kcontrol_new ad_beep_mixer[] = {
         { } /* end */
 };
 
+static struct snd_kcontrol_new ad_beep2_mixer[] = {
+        HDA_CODEC_VOLUME("Digital Beep Playback Volume", 0, 0, HDA_OUTPUT),
+        HDA_CODEC_MUTE_BEEP("Digital Beep Playback Switch", 0, 0, HDA_OUTPUT),
+        { } /* end */
+};
+
 #define set_beep_amp(spec, nid, idx, dir) \
         ((spec)->beep_amp = HDA_COMPOSE_AMP_VAL(nid, 1, idx, dir)) /* mono */
 #else
@@ -203,7 +210,8 @@ static int ad198x_build_controls(struct hda_codec *codec)
 #ifdef CONFIG_SND_HDA_INPUT_BEEP
         if (spec->beep_amp) {
                 struct snd_kcontrol_new *knew;
-                for (knew = ad_beep_mixer; knew->name; knew++) {
+                knew = spec->analog_beep ? ad_beep2_mixer : ad_beep_mixer;
+                for ( ; knew->name; knew++) {
                         struct snd_kcontrol *kctl;
                         kctl = snd_ctl_new1(knew, codec);
                         if (!kctl)
@@ -3482,6 +3490,8 @@ static struct snd_kcontrol_new ad1984_thinkpad_mixers[] = {
         HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x00, HDA_INPUT),
         HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x20, 0x01, HDA_INPUT),
         HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x20, 0x01, HDA_INPUT),
+        HDA_CODEC_VOLUME("Beep Playback Volume", 0x20, 0x03, HDA_INPUT),
+        HDA_CODEC_MUTE("Beep Playback Switch", 0x20, 0x03, HDA_INPUT),
         HDA_CODEC_VOLUME("Docking Mic Playback Volume", 0x20, 0x04, HDA_INPUT),
         HDA_CODEC_MUTE("Docking Mic Playback Switch", 0x20, 0x04, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Boost", 0x14, 0x0, HDA_INPUT),
@@ -3523,6 +3533,8 @@ static struct hda_verb ad1984_thinkpad_init_verbs[] = {
         {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
         /* docking mic boost */
         {0x25, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        /* Analog PC Beeper - allow firmware/ACPI beeps */
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3) | 0x1a},
         /* Analog mixer - docking mic; mute as default */
         {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
         /* enable EAPD bit */
@@ -3655,6 +3667,7 @@ static int patch_ad1984(struct hda_codec *codec)
                 spec->input_mux = &ad1984_thinkpad_capture_source;
                 spec->mixers[0] = ad1984_thinkpad_mixers;
                 spec->init_verbs[spec->num_init_verbs++] = ad1984_thinkpad_init_verbs;
+                spec->analog_beep = 1;
                 break;
         case AD1984_DELL_DESKTOP:
                 spec->multiout.dig_out_nid = 0;
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index ca93c4cc144e..1694f60631a1 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -275,6 +275,18 @@ struct alc_mic_route {
 
 #define MUX_IDX_UNDEF   ((unsigned char)-1)
 
+struct alc_customize_define {
+        unsigned int  sku_cfg;
+        unsigned char port_connectivity;
+        unsigned char check_sum;
+        unsigned char customization;
+        unsigned char external_amp;
+        unsigned int  enable_pcbeep:1;
+        unsigned int  platform_type:1;
+        unsigned int  swap:1;
+        unsigned int  override:1;
+};
+
 struct alc_spec {
         /* codec parameterization */
         struct snd_kcontrol_new *mixers[5];     /* mixer arrays */
@@ -332,6 +344,7 @@ struct alc_spec {
 
         /* 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];
@@ -1247,6 +1260,62 @@ static void alc_init_auto_mic(struct hda_codec *codec)
         spec->unsol_event = alc_sku_unsol_event;
 }
 
+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;
+
+        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;
+
+        snd_printd("SKU: Nid=0x%x sku_cfg=0x%08x\n",
+                   nid, spec->cdefine.sku_cfg);
+        snd_printd("SKU: port_connectivity=0x%x\n",
+                   spec->cdefine.port_connectivity);
+        snd_printd("SKU: enable_pcbeep=0x%x\n", spec->cdefine.enable_pcbeep);
+        snd_printd("SKU: check_sum=0x%08x\n", spec->cdefine.check_sum);
+        snd_printd("SKU: customization=0x%08x\n", spec->cdefine.customization);
+        snd_printd("SKU: external_amp=0x%x\n", spec->cdefine.external_amp);
+        snd_printd("SKU: platform_type=0x%x\n", spec->cdefine.platform_type);
+        snd_printd("SKU: swap=0x%x\n", spec->cdefine.swap);
+        snd_printd("SKU: override=0x%x\n", spec->cdefine.override);
+
+        return 0;
+}
+
 /* check subsystem ID and set up device-specific initialization;
  * return 1 if initialized, 0 if invalid SSID
  */
@@ -3780,6 +3849,17 @@ static struct hda_codec_ops alc_patch_ops = {
         .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;
+}
 
 /*
  * Test configuration for debugging
@@ -10335,6 +10415,8 @@ static int patch_alc882(struct hda_codec *codec)
 
         codec->spec = spec;
 
+        alc_auto_parse_customize_define(codec);
+
         switch (codec->vendor_id) {
         case 0x10ec0882:
         case 0x10ec0885:
@@ -10430,7 +10512,9 @@ static int patch_alc882(struct hda_codec *codec)
         }
 
         set_capture_mixer(codec);
-        set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
+
+        if (spec->cdefine.enable_pcbeep)
+                set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
 
         spec->vmaster_nid = 0x0c;
 
@@ -12214,6 +12298,7 @@ static int patch_alc262(struct hda_codec *codec)
         snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_PROC_COEF, tmp | 0x80);
         }
 #endif
+        alc_auto_parse_customize_define(codec);
 
         alc_fix_pll_init(codec, 0x20, 0x0a, 10);
 
@@ -12292,7 +12377,7 @@ static int patch_alc262(struct hda_codec *codec)
         }
         if (!spec->cap_mixer && !spec->no_analog)
                 set_capture_mixer(codec);
-        if (!spec->no_analog)
+        if (!spec->no_analog && spec->cdefine.enable_pcbeep)
                 set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
 
         spec->vmaster_nid = 0x0c;
@@ -14162,17 +14247,17 @@ static int patch_alc269(struct hda_codec *codec)
 
         codec->spec = spec;
 
-        alc_fix_pll_init(codec, 0x20, 0x04, 15);
+        alc_auto_parse_customize_define(codec);
 
         if ((alc_read_coef_idx(codec, 0) & 0x00f0) == 0x0010){
-                kfree(codec->chip_name);
-                codec->chip_name = kstrdup("ALC259", GFP_KERNEL);
-                if (!codec->chip_name) {
-                        alc_free(codec);
-                        return -ENOMEM;
-                }
+                if (codec->bus->pci->subsystem_vendor == 0x1025 &&
+                    spec->cdefine.platform_type == 1)
+                        alc_codec_rename(codec, "ALC271X");
+                else
+                        alc_codec_rename(codec, "ALC259");
                 is_alc269vb = 1;
-        }
+        } else
+                alc_fix_pll_init(codec, 0x20, 0x04, 15);
 
         board_config = snd_hda_check_board_config(codec, ALC269_MODEL_LAST,
                                                   alc269_models,
@@ -14234,7 +14319,8 @@ static int patch_alc269(struct hda_codec *codec)
 
         if (!spec->cap_mixer)
                 set_capture_mixer(codec);
-        set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT);
+        if (spec->cdefine.enable_pcbeep)
+                set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT);
 
         spec->vmaster_nid = 0x02;
 
@@ -18384,16 +18470,16 @@ static int patch_alc662(struct hda_codec *codec)
 
         codec->spec = spec;
 
+        alc_auto_parse_customize_define(codec);
+
         alc_fix_pll_init(codec, 0x20, 0x04, 15);
 
-        if (alc_read_coef_idx(codec, 0)==0x8020){
-                kfree(codec->chip_name);
-                codec->chip_name = kstrdup("ALC661", GFP_KERNEL);
-                if (!codec->chip_name) {
-                        alc_free(codec);
-                        return -ENOMEM;
-                }
-        }
+        if (alc_read_coef_idx(codec, 0) == 0x8020)
+                alc_codec_rename(codec, "ALC661");
+        else if ((alc_read_coef_idx(codec, 0) & (1 << 14)) &&
+                 codec->bus->pci->subsystem_vendor == 0x1025 &&
+                 spec->cdefine.platform_type == 1)
+                alc_codec_rename(codec, "ALC272X");
 
         board_config = snd_hda_check_board_config(codec, ALC662_MODEL_LAST,
                                                   alc662_models,
@@ -18443,18 +18529,20 @@ static int patch_alc662(struct hda_codec *codec)
         if (!spec->cap_mixer)
                 set_capture_mixer(codec);
 
-        switch (codec->vendor_id) {
-        case 0x10ec0662:
-                set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
-                break;
-        case 0x10ec0272:
-        case 0x10ec0663:
-        case 0x10ec0665:
-                set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT);
-                break;
-        case 0x10ec0273:
-                set_beep_amp(spec, 0x0b, 0x03, HDA_INPUT);
-                break;
+        if (spec->cdefine.enable_pcbeep) {
+                switch (codec->vendor_id) {
+                case 0x10ec0662:
+                        set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
+                        break;
+                case 0x10ec0272:
+                case 0x10ec0663:
+                case 0x10ec0665:
+                        set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT);
+                        break;
+                case 0x10ec0273:
+                        set_beep_amp(spec, 0x0b, 0x03, HDA_INPUT);
+                        break;
+                }
         }
         spec->vmaster_nid = 0x02;