sound fixes for v3.10-rc5
Linus,
The following changes since commit 8a90bb5116889e98008fbc8178fc2a77bb51df4a:
Merge tag 'asoc-v3.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus (2013-05-29 12:52:16 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-3.10
for you to fetch changes up to 11e7064f35bb87da8f427d1aa4bbd8b7473a3993:
ALSA: usb-audio - Fix invalid volume resolution on Logitech HD webcam c270 (2013-06-05 08:35:26 +0200)
----------------------------------------------------------------
sound fixes for v3.10-rc5
- A pile of small regression fix patches for HD-audio VIA codecs
- Quirks for HD-aduio and USB-audio devices
- A trivial SIS7019 error path fix
----------------------------------------------------------------
Clemens Ladisch (1):
ALSA: usb-audio: fix Roland/Cakewalk UM-3G support
David Henningsson (1):
ALSA: hda - Add headset quirk for two Dell machines
Ebben Aries (1):
ALSA: hda - add dock support for Thinkpad T431s
Takashi Iwai (7):
ALSA: hda/via - Disable broken dynamic power control
ALSA: hda - Allow setting automute/automic hooks after parsing
ALSA: hda - Add keep_eapd_on flag to generic parser
ALSA: hda/via - Fix wrongly cleared pins after suspend on VT1802
ALSA: hda/via - Clean up duplicated codes
ALSA: usb-audio - Apply Logitech QuickCam Pro 9000 quirk only to audio iface
ALSA: usb-audio - Fix invalid volume resolution on Logitech HD webcam c270
Wei Yongjun (1):
ALSA: sis7019: fix error return code in sis_chip_create()
sound/pci/hda/hda_generic.c | 68 ++++++++++++++++++++++++------------------- sound/pci/hda/hda_generic.h | 1 + sound/pci/hda/patch_realtek.c | 3 ++ sound/pci/hda/patch_via.c | 10 ++++++- sound/pci/sis7019.c | 3 +- sound/usb/mixer.c | 1 + sound/usb/quirks-table.h | 14 +++++++-- 7 files changed, 66 insertions(+), 34 deletions(-)
sound/pci/hda/hda_generic.c +38 -30
@@ -788,6 +788,8 @@ static void set_pin_eapd(struct hda_codec *codec, hda_nid_t pin, bool enable)return ;if (codec->inv_eapd) enable = !enable; +if (spec->keep_eapd_on && !enable) +return ;snd_hda_codec_update_cache (codec, pin,0 ,AC_VERB_SET_EAPD_BTLENABLE , enable ?0x02 :0x00 );
@@ -1938,17 +1940,7 @@ static int create_speaker_out_ctls(struct hda_codec *codec)* independent HP controls */ -/* update HP auto-mute state too */ -static void update_hp_automute_hook (struct hda_codec *codec) -{ -struct hda_gen_spec *spec = codec->spec; - -if (spec->hp_automute_hook) - spec->hp_automute_hook (codec,NULL ); -else -snd_hda_gen_hp_automute (codec,NULL ); -} - +static void call_hp_automute (struct hda_codec *codec,struct hda_jack_tbl *jack);static int indep_hp_info (struct snd_kcontrol *kcontrol,struct snd_ctl_elem_info *uinfo) {
@@ -2009,7 +2001,7 @@ static int indep_hp_put(struct snd_kcontrol *kcontrol,else *dacp = spec->alt_dac_nid; -update_hp_automute_hook (codec); +call_hp_automute (codec,NULL ); ret =1 ; } unlock:
@@ -2305,7 +2297,7 @@ static void update_hp_mic(struct hda_codec *codec, int adc_mux, bool force)else val =PIN_HP ;set_pin_target (codec, pin, val, true); -update_hp_automute_hook (codec); +call_hp_automute (codec,NULL ); } }
@@ -2714,7 +2706,7 @@ static int hp_mic_jack_mode_put(struct snd_kcontrol *kcontrol, val =snd_hda_get_default_vref (codec, nid); }snd_hda_set_pin_ctl_cache (codec, nid, val); -update_hp_automute_hook (codec); +call_hp_automute (codec,NULL );return 1 ; }
@@ -3859,20 +3851,42 @@ void snd_hda_gen_mic_autoswitch(struct hda_codec *codec, struct hda_jack_tbl *ja }EXPORT_SYMBOL_HDA (snd_hda_gen_mic_autoswitch); -/* update jack retasking */ -static void update_automute_all (struct hda_codec *codec) +/* call appropriate hooks */ +static void call_hp_automute (struct hda_codec *codec,struct hda_jack_tbl *jack) {struct hda_gen_spec *spec = codec->spec; +if (spec->hp_automute_hook) + spec->hp_automute_hook (codec, jack); +else +snd_hda_gen_hp_automute (codec, jack); +} -update_hp_automute_hook (codec); +static void call_line_automute (struct hda_codec *codec, +struct hda_jack_tbl *jack) +{ +struct hda_gen_spec *spec = codec->spec;if (spec->line_automute_hook) - spec->line_automute_hook (codec,NULL ); + spec->line_automute_hook (codec, jack);else -snd_hda_gen_line_automute (codec,NULL ); +snd_hda_gen_line_automute (codec, jack); +} + +static void call_mic_autoswitch (struct hda_codec *codec, +struct hda_jack_tbl *jack) +{ +struct hda_gen_spec *spec = codec->spec;if (spec->mic_autoswitch_hook) - spec->mic_autoswitch_hook (codec,NULL ); + spec->mic_autoswitch_hook (codec, jack);else -snd_hda_gen_mic_autoswitch (codec,NULL ); +snd_hda_gen_mic_autoswitch (codec, jack); +} + +/* update jack retasking */ +static void update_automute_all (struct hda_codec *codec) +{ +call_hp_automute (codec,NULL ); +call_line_automute (codec,NULL ); +call_mic_autoswitch (codec,NULL ); }/*
@@ -4009,9 +4023,7 @@ static int check_auto_mute_availability(struct hda_codec *codec)snd_printdd ("hda-codec: Enable HP auto-muting on NID 0x%x\n" , nid);snd_hda_jack_detect_enable_callback (codec, nid,HDA_GEN_HP_EVENT , - spec->hp_automute_hook ? - spec->hp_automute_hook : - snd_hda_gen_hp_automute); + call_hp_automute); spec->detect_hp =1 ; }
@@ -4024,9 +4036,7 @@ static int check_auto_mute_availability(struct hda_codec *codec)snd_printdd ("hda-codec: Enable Line-Out auto-muting on NID 0x%x\n" , nid);snd_hda_jack_detect_enable_callback (codec, nid,HDA_GEN_FRONT_EVENT , - spec->line_automute_hook ? - spec->line_automute_hook : - snd_hda_gen_line_automute); + call_line_automute); spec->detect_lo =1 ; } spec->automute_lo_possible = spec->detect_hp;
@@ -4068,9 +4078,7 @@ static bool auto_mic_check_imux(struct hda_codec *codec)snd_hda_jack_detect_enable_callback (codec, spec->am_entry[i].pin,HDA_GEN_MIC_EVENT , - spec->mic_autoswitch_hook ? - spec->mic_autoswitch_hook : - snd_hda_gen_mic_autoswitch); + call_mic_autoswitch);return true; }
sound/pci/hda/hda_generic.h +1 -0
@@ -222,6 +222,7 @@ struct hda_gen_spec { unsigned int multi_cap_vol:1; /* allow multiple capture xxx volumes */ unsigned int inv_dmic_split:1; /* inverted dmic w/a for conexant */ unsigned int own_eapd_ctl:1; /* set EAPD by own function */ + unsigned int keep_eapd_on:1; /* don't turn off EAPD automatically */ unsigned int vmaster_mute_enum:1; /* add vmaster mute mode enum */ unsigned int indep_hp:1; /* independent HP supported */ unsigned int prefer_hp_amp:1; /* enable HP amp for speaker if any */
sound/pci/hda/patch_realtek.c +3 -0
@@ -3493,6 +3493,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x1028 ,0x05f4 ,"Dell" ,ALC269_FIXUP_DELL1_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x05f5 ,"Dell" ,ALC269_FIXUP_DELL1_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x05f6 ,"Dell" ,ALC269_FIXUP_DELL1_MIC_NO_PRESENCE ), +SND_PCI_QUIRK (0x1028 ,0x05f8 ,"Dell" ,ALC269_FIXUP_DELL1_MIC_NO_PRESENCE ), +SND_PCI_QUIRK (0x1028 ,0x0609 ,"Dell" ,ALC269_FIXUP_DELL1_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x103c ,0x1586 ,"HP" ,ALC269_FIXUP_HP_MUTE_LED_MIC2 ),SND_PCI_QUIRK (0x103c ,0x18e6 ,"HP" ,ALC269_FIXUP_HP_GPIO_LED ), SND_PCI_QUIRK(0x103c, 0x1973, "HP Pavilion", ALC269_FIXUP_HP_MUTE_LED_MIC1),
@@ -3530,6 +3532,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x17aa ,0x21fa ,"Thinkpad X230" ,ALC269_FIXUP_LENOVO_DOCK ),SND_PCI_QUIRK (0x17aa ,0x21f3 ,"Thinkpad T430" ,ALC269_FIXUP_LENOVO_DOCK ),SND_PCI_QUIRK (0x17aa ,0x21fb ,"Thinkpad T430s" ,ALC269_FIXUP_LENOVO_DOCK ), +SND_PCI_QUIRK (0x17aa ,0x2208 ,"Thinkpad T431s" ,ALC269_FIXUP_LENOVO_DOCK ),SND_PCI_QUIRK (0x17aa ,0x2203 ,"Thinkpad X230 Tablet" ,ALC269_FIXUP_LENOVO_DOCK ),SND_PCI_QUIRK (0x17aa ,0x3bf8 ,"Quanta FL1" ,ALC269_FIXUP_PCM_44K ), SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD),
sound/pci/hda/patch_via.c +9 -1
@@ -136,6 +136,7 @@ static struct via_spec *via_new_spec(struct hda_codec *codec) spec->codec_type =VT1708S ; spec->no_pin_power_ctl =1 ; spec->gen.indep_hp =1 ; + spec->gen.keep_eapd_on =1 ; spec->gen.pcm_playback_hook = via_playback_pcm_hook;return spec; }
@@ -231,9 +232,14 @@ static void vt1708_update_hp_work(struct hda_codec *codec)static void set_widgets_power_state (struct hda_codec *codec) { +#if 0 /* FIXME: the assumed connections don't match always with the +* actual routes by the generic parser, so better to disable +* the control for safety. +*/ struct via_spec *spec = codec->spec;if (spec->set_widgets_power_state) spec->set_widgets_power_state (codec); +#endif } static void update_power_state(struct hda_codec *codec, hda_nid_t nid,
@@ -478,7 +484,9 @@ static int via_suspend(struct hda_codec *codec)/* Fix pop noise on headphones */ int i;for (i =0 ; i < spec->gen.autocfg.hp_outs; i++) -snd_hda_set_pin_ctl (codec, spec->gen.autocfg.hp_pins[i],0 ); +snd_hda_codec_write (codec, spec->gen.autocfg.hp_pins[i], +0 ,AC_VERB_SET_PIN_WIDGET_CONTROL , +0x00 ); }return 0 ;
sound/pci/sis7019.c +2 -1
@@ -1341,7 +1341,8 @@ static int sis_chip_create(struct snd_card *card,if (rc) goto error_out; -if (pci_set_dma_mask (pci,DMA_BIT_MASK (30 )) <0 ) { + rc =pci_set_dma_mask (pci,DMA_BIT_MASK (30 )); +if (rc <0 ) {dev_err (&pci->dev,"architecture does not support 30-bit PCI busmaster DMA" ); goto error_out_enabled; }
sound/usb/mixer.c +1 -0
@@ -886,6 +886,7 @@ static void volume_control_quirks(struct usb_mixer_elem_info *cval,case USB_ID (0x046d ,0x0808 ):case USB_ID (0x046d ,0x0809 ):case USB_ID (0x046d ,0x081d ):/* HD Webcam c510 */ +case USB_ID (0x046d ,0x0825 ):/* HD Webcam c270 */ case USB_ID (0x046d ,0x0991 ):/* Most audio usb devices lie about volume resolution. * Most Logitech webcams have res = 384.
sound/usb/quirks-table.h +12 -2
@@ -215,7 +215,13 @@ .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL }, { - USB_DEVICE(0x046d, 0x0990), + .match_flags =USB_DEVICE_ID_MATCH_DEVICE | +USB_DEVICE_ID_MATCH_INT_CLASS | + USB_DEVICE_ID_MATCH_INT_SUBCLASS, + .idVendor = 0x046d, + .idProduct = 0x0990, + .bInterfaceClass = USB_CLASS_AUDIO, + .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, .driver_info = (unsigned long ) & (const struct snd_usb_audio_quirk ) { .vendor_name ="Logitech, Inc." , .product_name ="QuickCam Pro 9000" ,
@@ -1792,7 +1798,11 @@ YAMAHA_DEVICE(0x7010, "UB99"), USB_DEVICE_VENDOR_SPEC(0x0582, 0x0108), .driver_info = (unsigned long ) & (const struct snd_usb_audio_quirk ) { .ifnum =0 , - .type =QUIRK_MIDI_STANDARD_INTERFACE + .type =QUIRK_MIDI_FIXED_ENDPOINT , + .data = & (const struct snd_usb_midi_endpoint_info ) { + .out_cables =0x0007 , + .in_cables =0x0007 + } } }, {