1 files changed, 17 insertions, 13 deletions

diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index af34606c30c3..afbe314a5bf3 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)
@@ -519,14 +527,6 @@ static int ad198x_suspend(struct hda_codec *codec, pm_message_t state)
         ad198x_power_eapd(codec);
         return 0;
 }
-
-static int ad198x_resume(struct hda_codec *codec)
-{
-        ad198x_init(codec);
-        snd_hda_codec_resume_amp(codec);
-        snd_hda_codec_resume_cache(codec);
-        return 0;
-}
 #endif
 
 static struct hda_codec_ops ad198x_patch_ops = {
@@ -539,7 +539,6 @@ static struct hda_codec_ops ad198x_patch_ops = {
 #endif
 #ifdef SND_HDA_NEEDS_RESUME
         .suspend = ad198x_suspend,
-        .resume = ad198x_resume,
 #endif
         .reboot_notify = ad198x_shutup,
 };
@@ -3490,6 +3489,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),
@@ -3531,6 +3532,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 */
@@ -3663,6 +3666,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;