sound fixes for 2.6.35-rc4
Linus,
please pull sound fixes for v2.6.35-rc4 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
So far, little surprises came for 2.6.35 in the sound area. This one includes only a few USB audio v2-specific fixes, a regression (Oops) fix on 2.6.34, and a quirk fix for Intel Mac.
Thanks!
Takashi
===
Alex Murray (1):
ALSA: hda - Fix line-in for mb5 model MacBook (Pro) 5,1 / 5,2
Daniel Mack (4):
ALSA: usb-audio: add check for faulty clock in parse_audio_format_rates_v2()
ALSA: usb-audio: fix control messages for USB_RECIP_INTERFACE
ALSA: usb-audio: parse UAC2 sample rate ranges correctly
ALSA: usb-audio: fix UAC2 control value queries
Takashi Iwai (1):
ALSA: hda - Don't check capture source mixer if no ADC is available
--- sound/pci/hda/patch_realtek.c | 35 +++++++------- sound/usb/clock.c | 12 +++-- sound/usb/format.c | 104 +++++++++++++++++++++++++++++++++-------- sound/usb/helper.h | 4 ++ sound/usb/mixer.c | 19 ++++++-- 5 files changed, 128 insertions(+), 46 deletions(-)
sound/pci/hda/patch_realtek.c +18 -17
@@ -2619,16 +2619,18 @@ static int alc_build_controls(struct hda_codec *codec) }/* assign Capture Source enums to NID */ - kctl =snd_hda_find_mixer_ctl (codec,"Capture Source" ); -if (!kctl) - kctl =snd_hda_find_mixer_ctl (codec,"Input Source" ); -for (i =0 ; kctl && i < kctl->count; i++) { -hda_nid_t *nids = spec->capsrc_nids; -if (!nids) - nids = spec->adc_nids; - err =snd_hda_add_nid (codec, kctl, i, nids[i]); -if (err <0 ) -return err; +if (spec->capsrc_nids || spec->adc_nids) { + kctl =snd_hda_find_mixer_ctl (codec,"Capture Source" ); +if (!kctl) + kctl =snd_hda_find_mixer_ctl (codec,"Input Source" ); +for (i =0 ; kctl && i < kctl->count; i++) { +hda_nid_t *nids = spec->capsrc_nids; +if (!nids) + nids = spec->adc_nids; + err =snd_hda_add_nid (codec, kctl, i, nids[i]); +if (err <0 ) +return err; + } }if (spec->cap_mixer) {const char *kname = kctl ? kctl->id.name :NULL ;
@@ -6948,7 +6950,7 @@ static struct hda_input_mux mb5_capture_source = { .num_items = 3, .items = { { "Mic", 0x1 }, - { "Line", 0x2 }, + { "Line", 0x7 }, { "CD", 0x4 }, }, };
@@ -7469,8 +7471,8 @@ static struct snd_kcontrol_new alc885_mb5_mixer[] = {HDA_BIND_MUTE ("LFE Playback Switch" ,0x0e ,0x02 ,HDA_INPUT ),HDA_CODEC_VOLUME ("Headphone Playback Volume" ,0x0f ,0x00 ,HDA_OUTPUT ),HDA_BIND_MUTE ("Headphone Playback Switch" ,0x0f ,0x02 ,HDA_INPUT ), -HDA_CODEC_VOLUME ("Line Playback Volume" ,0x0b ,0x02 ,HDA_INPUT ), -HDA_CODEC_MUTE ("Line Playback Switch" ,0x0b ,0x02 ,HDA_INPUT ), +HDA_CODEC_VOLUME ("Line Playback Volume" ,0x0b ,0x07 ,HDA_INPUT ), +HDA_CODEC_MUTE ("Line Playback Switch" ,0x0b ,0x07 ,HDA_INPUT ),HDA_CODEC_VOLUME ("Mic Playback Volume" ,0x0b ,0x01 ,HDA_INPUT ),HDA_CODEC_MUTE ("Mic Playback Switch" ,0x0b ,0x01 ,HDA_INPUT ), HDA_CODEC_VOLUME("Line Boost", 0x15, 0x00, HDA_INPUT),
@@ -7853,10 +7855,9 @@ static struct hda_verb alc885_mb5_init_verbs[] = { {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, - {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, - {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, - {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, - {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, + {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0x1)}, + {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0x7)}, + {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0x4)}, { } };
sound/usb/clock.c +8 -4
@@ -103,7 +103,8 @@ static int uac_clock_selector_get_val(struct snd_usb_audio *chip, int selector_i ret =snd_usb_ctl_msg (chip->dev,usb_rcvctrlpipe (chip->dev,0 ),UAC2_CS_CUR ,USB_RECIP_INTERFACE |USB_TYPE_CLASS |USB_DIR_IN , -UAC2_CX_CLOCK_SELECTOR <<8 , selector_id <<8 , +UAC2_CX_CLOCK_SELECTOR <<8 , +snd_usb_ctrl_intf (chip) | (selector_id <<8 ), &buf,sizeof (buf),1000 );if (ret <0 )
@@ -120,7 +121,8 @@ static bool uac_clock_source_is_valid(struct snd_usb_audio *chip, int source_id) err =snd_usb_ctl_msg (dev,usb_rcvctrlpipe (dev,0 ),UAC2_CS_CUR ,USB_TYPE_CLASS |USB_RECIP_INTERFACE |USB_DIR_IN , -UAC2_CS_CONTROL_CLOCK_VALID <<8 , source_id <<8 , +UAC2_CS_CONTROL_CLOCK_VALID <<8 , +snd_usb_ctrl_intf (chip) | (source_id <<8 ), &data,sizeof (data),1000 );if (err <0 ) {
@@ -269,7 +271,8 @@ static int set_sample_rate_v2(struct snd_usb_audio *chip, int iface, data[3 ] = rate >>24 ;if ((err =snd_usb_ctl_msg (dev,usb_sndctrlpipe (dev,0 ),UAC2_CS_CUR ,USB_TYPE_CLASS |USB_RECIP_INTERFACE |USB_DIR_OUT , -UAC2_CS_CONTROL_SAM_FREQ <<8 , clock <<8 , +UAC2_CS_CONTROL_SAM_FREQ <<8 , +snd_usb_ctrl_intf (chip) | (clock <<8 ), data,sizeof (data),1000 )) <0 ) {snd_printk (KERN_ERR "%d:%d:%d: cannot set freq %d (v2)\n" , dev->devnum, iface, fmt->altsetting, rate);
@@ -278,7 +281,8 @@ static int set_sample_rate_v2(struct snd_usb_audio *chip, int iface,if ((err =snd_usb_ctl_msg (dev,usb_rcvctrlpipe (dev,0 ),UAC2_CS_CUR ,USB_TYPE_CLASS |USB_RECIP_INTERFACE |USB_DIR_IN , -UAC2_CS_CONTROL_SAM_FREQ <<8 , clock <<8 , +UAC2_CS_CONTROL_SAM_FREQ <<8 , +snd_usb_ctrl_intf (chip) | (clock <<8 ), data,sizeof (data),1000 )) <0 ) {snd_printk (KERN_WARNING "%d:%d:%d: cannot get freq (v2)\n" , dev->devnum, iface, fmt->altsetting);
sound/usb/format.c +84 -20
144 lines not on this page · raw message
sound/usb/helper.h +4 -0
@@ -28,5 +28,9 @@ unsigned char snd_usb_parse_datainterval(struct snd_usb_audio *chip,#define snd_usb_get_speed (dev) ((dev)->speed)#endif +static inline int snd_usb_ctrl_intf (struct snd_usb_audio *chip) +{ +return get_iface_desc (chip->ctrl_intf)->bInterfaceNumber; +}#endif /* __USBAUDIO_HELPER_H */
sound/usb/mixer.c +14 -5
@@ -297,20 +297,27 @@ static int get_ctl_value_v1(struct usb_mixer_elem_info *cval, int request, int vstatic int get_ctl_value_v2 (struct usb_mixer_elem_info *cval,int request,int validx,int *value_ret) { -unsigned char buf[14 ];/* enough space for one range of 4 bytes */ +unsigned char buf[2 +3 *sizeof (__u16)];/* enough space for one range */ unsigned char *val; -int ret; +int ret, size;__u8 bRequest; - bRequest = (request ==UAC_GET_CUR ) ? -UAC2_CS_CUR :UAC2_CS_RANGE ; +if (request ==UAC_GET_CUR ) { + bRequest =UAC2_CS_CUR ; + size =sizeof (__u16); + }else { + bRequest =UAC2_CS_RANGE ; + size =sizeof (buf); + } + +memset (buf,0 ,sizeof (buf)); ret =snd_usb_ctl_msg (cval->mixer->chip->dev,usb_rcvctrlpipe (cval->mixer->chip->dev,0 ), bRequest,USB_RECIP_INTERFACE |USB_TYPE_CLASS |USB_DIR_IN , validx, cval->mixer->ctrlif | (cval->id <<8 ), - buf,sizeof (buf),1000 ); + buf, size,1000 );if (ret <0 ) { snd_printk(KERN_ERR "cannot get ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d\n",
@@ -318,6 +325,8 @@ static int get_ctl_value_v2(struct usb_mixer_elem_info *cval, int request, int vreturn ret; } +/* FIXME: how should we handle multiple triplets here? */ +switch (request) {case UAC_GET_CUR : val = buf;
At Tue, 15 Jun 2010 13:11:18 +0200,
Quoted 10 lines · I wrote:
Linus,
please pull sound fixes for v2.6.35-rc4 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.gitfor-linusSo far, little surprises came for 2.6.35 in the sound area. This one includes only a few USB audio v2-specific fixes, a regression (Oops) fix on 2.6.34, and a quirk fix for Intel Mac.
FYI, two more patches have been added to for-linus branch. The URL is same:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
The latest shortlog is below.
thanks,
Takashi
===
Alex Murray (1):
ALSA: hda - Fix line-in for mb5 model MacBook (Pro) 5,1 / 5,2
Daniel Mack (4):
ALSA: usb-audio: add check for faulty clock in parse_audio_format_rates_v2()
ALSA: usb-audio: fix control messages for USB_RECIP_INTERFACE
ALSA: usb-audio: parse UAC2 sample rate ranges correctly
ALSA: usb-audio: fix UAC2 control value queries
Eliot Blennerhassett (1):
ALSA: asihpi - Get rid of incorrect "long" types and casts.
Sudhakar Rajashekhara (1):
ASoC: DaVinci: Fix McASP hardware FIFO configuration
Takashi Iwai (1):
ALSA: hda - Don't check capture source mixer if no ADC is available
sound/pci/asihpi/hpi6205.c | 22 ++++---- sound/pci/hda/patch_realtek.c | 35 ++++++------ sound/soc/davinci/davinci-mcasp.c | 2 - sound/usb/clock.c | 12 +++-- sound/usb/format.c | 104 ++++++++++++++++++++++++++++++------- sound/usb/helper.h | 4 ++ sound/usb/mixer.c | 19 +++++-- 7 files changed, 139 insertions(+), 59 deletions(-)