ALSA: hda - Use analog beep for Thinkpads with AD1984 codecs
authorTakashi Iwai <tiwai@suse.de>
Wed, 5 Mar 2014 11:00:29 +0000 (12:00 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 5 Mar 2014 11:00:29 +0000 (12:00 +0100)
For making the driver behavior compatible with the earlier kernels,
use the analog beep in the loopback path instead of the digital beep.

Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_analog.c

index 4989710958691f31c8e24c66c8b3e91dafc6ae1f..8ed0bcc0138637e69e19ff7056b99a86fac09fa6 100644 (file)
@@ -1026,6 +1026,9 @@ static void ad1884_fixup_thinkpad(struct hda_codec *codec,
                spec->gen.keep_eapd_on = 1;
                spec->gen.vmaster_mute.hook = ad_vmaster_eapd_hook;
                spec->eapd_nid = 0x12;
+               /* Analog PC Beeper - allow firmware/ACPI beeps */
+               spec->beep_amp = HDA_COMPOSE_AMP_VAL(0x20, 3, 3, HDA_INPUT);
+               spec->gen.beep_nid = 0; /* no digital beep */
        }
 }