Merge remote branch 'alsa/devel' into topic/hda

2 files changed, 31 insertions, 14 deletions

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 8b2915631cc..a33c1c50b31 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);
@@ -2573,7 +2577,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) {
@@ -2662,7 +2666,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 e6d1bdff1b6..262f5b5decf 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;