sound fixes for 3.14-rc6
Linus,
please pull sound fixes for v3.14-rc6 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-3.14-rc6
The topmost commit is e805ca8b0a9b6c91099c0eaa4b160a1196a4ae25
----------------------------------------------------------------
sound fixes for 3.14-rc6
Just a few device-specific quirks for HD-audio and USB-audio, most of which are one-liners.
----------------------------------------------------------------
Hui Wang (1):
ALSA: hda - add automute fix for another dell AIO model
Marius Knaust (1):
ALSA: hda - Added inverted digital-mic handling for Acer TravelMate 8371
Takashi Iwai (3):
ALSA: hda - Add missing loopback merge path for AD1884/1984 codecs
ALSA: hda - Use analog beep for Thinkpads with AD1984 codecs
ALSA: usb-audio: Add quirk for Logitech Webcam C500
--- sound/pci/hda/patch_analog.c | 4 ++++ sound/pci/hda/patch_realtek.c | 3 ++- sound/usb/mixer.c | 1 + 3 files changed, 7 insertions(+), 1 deletion(-)
sound/pci/hda/patch_analog.c +4 -0
@@ -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 */ } }
@@ -1092,6 +1095,7 @@ static int patch_ad1884(struct hda_codec *codec) spec = codec->spec; spec->gen.mixer_nid =0x20 ; + spec->gen.mixer_merge_nid =0x21 ; spec->gen.beep_nid =0x10 ;set_beep_amp (spec,0x10 ,0 ,HDA_OUTPUT );
sound/pci/hda/patch_realtek.c +2 -1
@@ -4253,6 +4253,7 @@ static const struct hda_fixup alc269_fixups[] = { };static const struct snd_pci_quirk alc269_fixup_tbl[] = { +SND_PCI_QUIRK (0x1025 ,0x0283 ,"Acer TravelMate 8371" ,ALC269_FIXUP_INV_DMIC ),SND_PCI_QUIRK (0x1025 ,0x029b ,"Acer 1810TZ" ,ALC269_FIXUP_INV_DMIC ),SND_PCI_QUIRK (0x1025 ,0x0349 ,"Acer AOD260" ,ALC269_FIXUP_INV_DMIC ),SND_PCI_QUIRK (0x1025 ,0x047c ,"Acer AC700" ,ALC269_FIXUP_ACER_AC700 ),
@@ -5163,7 +5164,7 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = {SND_PCI_QUIRK (0x1028 ,0x0625 ,"Dell" ,ALC668_FIXUP_DELL_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x0626 ,"Dell" ,ALC668_FIXUP_DELL_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x0628 ,"Dell" ,ALC668_FIXUP_AUTO_MUTE ), -SND_PCI_QUIRK (0x1028 ,0x064e ,"Dell" ,ALC668_FIXUP_DELL_MIC_NO_PRESENCE ), +SND_PCI_QUIRK (0x1028 ,0x064e ,"Dell" ,ALC668_FIXUP_AUTO_MUTE ),SND_PCI_QUIRK (0x103c ,0x1632 ,"HP RP5800" ,ALC662_FIXUP_HP_RP5800 ),SND_PCI_QUIRK (0x1043 ,0x11cd ,"Asus N550" ,ALC662_FIXUP_BASS_1A_CHMAP ), SND_PCI_QUIRK(0x1043, 0x1477, "ASUS N56VZ", ALC662_FIXUP_BASS_CHMAP),
sound/usb/mixer.c +1 -0
@@ -883,6 +883,7 @@ static void volume_control_quirks(struct usb_mixer_elem_info *cval, }break ; +case USB_ID (0x046d ,0x0807 ):/* Logitech Webcam C500 */ case USB_ID (0x046d ,0x0808 ):case USB_ID (0x046d ,0x0809 ):case USB_ID (0x046d ,0x081b ):/* HD Webcam c310 */