sound fixes for 2.6.37-rc6
Subsystems (4)
Linus,
please pull sound fixes for v2.6.37-rc6 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
A few regression fixes for HDMI-audio handling, error-path fixes and misc fixes in ASoC, and yet a few HD-audio quirks. So, all are small and fine to apply.
Thanks!
Takashi
===
Anssi Hannula (3):
ALSA: hda - Do not wrongly restrict min_channels based on ELD
ALSA: hda - Always allow basic audio irrespective of ELD info
ALSA: hda - Reset sample sizes and max bitrates when reading ELD
Axel Lin (2):
ASoC: Hold client_mutex while calling snd_soc_instantiate_cards()
ASoC: Fix resource leak if soc_register_ac97_dai_link failed
Daniel T Chen (2):
ALSA: hda: Use model=lg quirk for LG P1 Express to enable playback and capture
ALSA: hda: Use position_fix=1 for Acer Aspire 5538 to enable capture on internal mic
David Henningsson (1):
ALSA: HDA: Quirk for Dell Vostro 320 to make microphone work
Jassi Brar (1):
ASoC: WM8580: Debug BCLK and sample size
John Baboval (1):
ALSA: hda - Fix ThinkPad T410[s] docking station line-out
Manoj Iyer (1):
ALSA: hda - Enable jack sense for Thinkpad Edge 13
Mark Brown (1):
ASoC: Correct WM8962 interrupt mask register read
Uk Kim (2):
ASoC: Fix off by one error in WM8994 EQ register bank size
ASoC: Fix swap of left and right channels for WM8993/4 speaker boost gain
--- include/linux/mfd/wm8994/pdata.h | 2 +- sound/pci/hda/hda_eld.c | 24 ++++++++++-------------- sound/pci/hda/hda_intel.c | 1 + sound/pci/hda/patch_conexant.c | 35 ++++++++++++++++++----------------- sound/pci/hda/patch_hdmi.c | 1 - sound/pci/hda/patch_realtek.c | 1 + sound/soc/codecs/wm8580.c | 8 ++++---- sound/soc/codecs/wm8962.c | 2 +- sound/soc/codecs/wm_hubs.c | 2 +- sound/soc/soc-core.c | 14 +++++++++----- 10 files changed, 46 insertions(+), 44 deletions(-)
include/linux/mfd/wm8994/pdata.h +1 -1
@@ -29,7 +29,7 @@ struct wm8994_ldo_pdata {#define WM8994_CONFIGURE_GPIO 0x8000#define WM8994_DRC_REGS 5 -#define WM8994_EQ_REGS 19 +#define WM8994_EQ_REGS 20/** * DRC configurations are specified with a label and a set of register
sound/pci/hda/hda_eld.c +10 -14
@@ -189,6 +189,9 @@ static void hdmi_update_short_audio_desc(struct cea_sad *a, a->channels =GRAB_BITS (buf,0 ,0 ,3 ); a->channels++; + a->sample_bits =0 ; + a->max_bitrate =0 ; + a->format =GRAB_BITS (buf,0 ,3 ,4 );switch (a->format) {case AUDIO_CODING_TYPE_REF_STREAM_HEADER :
@@ -198,7 +201,6 @@ static void hdmi_update_short_audio_desc(struct cea_sad *a,case AUDIO_CODING_TYPE_LPCM : val =GRAB_BITS (buf,2 ,0 ,3 ); - a->sample_bits =0 ;for (i =0 ; i <3 ; i++)if (val & (1 << i)) a->sample_bits |= cea_sample_sizes[i +1 ];
@@ -598,24 +600,19 @@ void hdmi_eld_update_pcm_info(struct hdmi_eld *eld, struct hda_pcm_stream *pcm, {int i; - pcm->rates =0 ; - pcm->formats =0 ; - pcm->maxbps =0 ; - pcm->channels_min =-1 ; - pcm->channels_max =0 ; +/* assume basic audio support (the basic audio flag is not in ELD; +* however, all audio capable sinks are required to support basic +* audio) */ + pcm->rates =SNDRV_PCM_RATE_32000 |SNDRV_PCM_RATE_44100 |SNDRV_PCM_RATE_48000 ; + pcm->formats =SNDRV_PCM_FMTBIT_S16_LE ; + pcm->maxbps =16 ; + pcm->channels_max =2 ;for (i =0 ; i < eld->sad_count; i++) {struct cea_sad *a = &eld->sad[i]; pcm->rates |= a->rates; -if (a->channels < pcm->channels_min) - pcm->channels_min = a->channels;if (a->channels > pcm->channels_max) pcm->channels_max = a->channels;if (a->format ==AUDIO_CODING_TYPE_LPCM ) { -if (a->sample_bits &AC_SUPPCM_BITS_16 ) { - pcm->formats |=SNDRV_PCM_FMTBIT_S16_LE ; -if (pcm->maxbps <16 ) - pcm->maxbps =16 ; - }if (a->sample_bits &AC_SUPPCM_BITS_20 ) { pcm->formats |=SNDRV_PCM_FMTBIT_S32_LE ;if (pcm->maxbps <20 )
@@ -635,7 +632,6 @@ void hdmi_eld_update_pcm_info(struct hdmi_eld *eld, struct hda_pcm_stream *pcm,/* restrict the parameters by the values the codec provides */ pcm->rates &= codec_pars->rates; pcm->formats &= codec_pars->formats; - pcm->channels_min =max (pcm->channels_min, codec_pars->channels_min); pcm->channels_max =min (pcm->channels_max, codec_pars->channels_max); pcm->maxbps =min (pcm->maxbps, codec_pars->maxbps); }
sound/pci/hda/hda_intel.c +1 -0
@@ -2296,6 +2296,7 @@ static int azx_dev_free(struct snd_device *device)*/ static struct snd_pci_quirk position_fix_list[]__devinitdata = {SND_PCI_QUIRK (0x1025 ,0x009f ,"Acer Aspire 5110" ,POS_FIX_LPIB ), +SND_PCI_QUIRK (0x1025 ,0x026f ,"Acer Aspire 5538" ,POS_FIX_LPIB ),SND_PCI_QUIRK (0x1028 ,0x01cc ,"Dell D820" ,POS_FIX_LPIB ),SND_PCI_QUIRK (0x1028 ,0x01de ,"Dell Precision 390" ,POS_FIX_LPIB ),SND_PCI_QUIRK (0x1028 ,0x01f6 ,"Dell Latitude 131L" ,POS_FIX_LPIB ),
sound/pci/hda/patch_conexant.c +18 -17
@@ -2116,8 +2116,8 @@ static void cxt5066_update_speaker(struct hda_codec *codec)struct conexant_spec *spec = codec->spec;unsigned int pinctl; -snd_printdd ("CXT5066: update speaker, hp_present=%d\n" , - spec->hp_present); +snd_printdd ("CXT5066: update speaker, hp_present=%d, cur_eapd=%d\n" , + spec->hp_present, spec->cur_eapd);/* Port A (HP) */ pinctl = ((spec->hp_present &1 ) && spec->cur_eapd) ?PIN_HP :0 ;
@@ -2125,11 +2125,20 @@ static void cxt5066_update_speaker(struct hda_codec *codec) pinctl);/* Port D (HP/LO) */ - pinctl = ((spec->hp_present &2 ) && spec->cur_eapd) - ? spec->port_d_mode :0 ; -/* Mute if Port A is connected on Thinkpad */ -if (spec->thinkpad && (spec->hp_present &1 )) - pinctl =0 ; +if (spec->dell_automute) { +/* DELL AIO Port Rule: PortA> PortD> IntSpk */ + pinctl = (!(spec->hp_present &1 ) && spec->cur_eapd) + ?PIN_OUT :0 ; + }else if (spec->thinkpad) { +if (spec->cur_eapd) + pinctl = spec->port_d_mode; +/* Mute dock line-out if Port A (laptop HP) is present */ +if (spec->hp_present&1 ) + pinctl =0 ; + }else { + pinctl = ((spec->hp_present &2 ) && spec->cur_eapd) + ? spec->port_d_mode :0 ; + }snd_hda_codec_write (codec,0x1c ,0 ,AC_VERB_SET_PIN_WIDGET_CONTROL , pinctl);
@@ -2137,14 +2146,6 @@ static void cxt5066_update_speaker(struct hda_codec *codec) pinctl = (!spec->hp_present && spec->cur_eapd) ?PIN_OUT :0 ;snd_hda_codec_write (codec,0x1f ,0 ,AC_VERB_SET_PIN_WIDGET_CONTROL , pinctl); - -if (spec->dell_automute) { -/* DELL AIO Port Rule: PortA > PortD > IntSpk */ - pinctl = (!(spec->hp_present &1 ) && spec->cur_eapd) - ?PIN_OUT :0 ; -snd_hda_codec_write (codec,0x1c ,0 , -AC_VERB_SET_PIN_WIDGET_CONTROL , pinctl); - } }/* turn on/off EAPD (+ mute HP) as a master switch */
@@ -3095,8 +3096,7 @@ static const char *cxt5066_models[CXT5066_MODELS] = {static struct snd_pci_quirk cxt5066_cfg_tbl[] = {SND_PCI_QUIRK_MASK (0x1025 ,0xff00 ,0x0400 ,"Acer" ,CXT5066_IDEAPAD ),SND_PCI_QUIRK (0x1028 ,0x02d8 ,"Dell Vostro" ,CXT5066_DELL_VOSTRO ), -SND_PCI_QUIRK (0x1028 ,0x02f5 ,"Dell" , -CXT5066_DELL_LAPTOP ), +SND_PCI_QUIRK (0x1028 ,0x02f5 ,"Dell Vostro 320" ,CXT5066_IDEAPAD ),SND_PCI_QUIRK (0x1028 ,0x0402 ,"Dell Vostro" ,CXT5066_DELL_VOSTRO ),SND_PCI_QUIRK (0x1028 ,0x0408 ,"Dell Inspiron One 19T" ,CXT5066_IDEAPAD ),SND_PCI_QUIRK (0x103c ,0x360b ,"HP G60" ,CXT5066_HP_LAPTOP ),
@@ -3109,6 +3109,7 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = {SND_PCI_QUIRK (0x152d ,0x0833 ,"OLPC XO-1.5" ,CXT5066_OLPC_XO_1_5 ),SND_PCI_QUIRK (0x17aa ,0x20f2 ,"Lenovo T400s" ,CXT5066_THINKPAD ),SND_PCI_QUIRK (0x17aa ,0x21b2 ,"Thinkpad X100e" ,CXT5066_IDEAPAD ), +SND_PCI_QUIRK (0x17aa ,0x21c5 ,"Thinkpad Edge 13" ,CXT5066_THINKPAD ),SND_PCI_QUIRK (0x17aa ,0x21b3 ,"Thinkpad Edge 13 (197)" ,CXT5066_IDEAPAD ),SND_PCI_QUIRK (0x17aa ,0x21b4 ,"Thinkpad Edge" ,CXT5066_IDEAPAD ), SND_PCI_QUIRK(0x17aa, 0x21c8, "Thinkpad Edge 11", CXT5066_IDEAPAD),
sound/pci/hda/patch_hdmi.c +0 -1
@@ -834,7 +834,6 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,return -ENODEV ; }else {/* fallback to the codec default */ - hinfo->channels_min = codec_pars->channels_min; hinfo->channels_max = codec_pars->channels_max; hinfo->rates = codec_pars->rates; hinfo->formats = codec_pars->formats;
sound/pci/hda/patch_realtek.c +1 -0
@@ -4595,6 +4595,7 @@ static struct snd_pci_quirk alc880_cfg_tbl[] = {SND_PCI_QUIRK (0x1734 ,0x10b0 ,"Fujitsu" ,ALC880_FUJITSU ),SND_PCI_QUIRK (0x1854 ,0x0018 ,"LG LW20" ,ALC880_LG_LW ),SND_PCI_QUIRK (0x1854 ,0x003b ,"LG" ,ALC880_LG ), +SND_PCI_QUIRK (0x1854 ,0x005f ,"LG P1 Express" ,ALC880_LG ),SND_PCI_QUIRK (0x1854 ,0x0068 ,"LG w1" ,ALC880_LG ),SND_PCI_QUIRK (0x1854 ,0x0077 ,"LG LW25" ,ALC880_LG_LW ), SND_PCI_QUIRK(0x19db, 0x4188, "TCL S700", ALC880_TCL_S700),
sound/soc/codecs/wm8580.c +4 -4
@@ -491,16 +491,16 @@ static int wm8580_paif_hw_params(struct snd_pcm_substream *substream, paifa |=0x8 ;break ;case SNDRV_PCM_FORMAT_S20_3LE : - paifa |=0x10 ; + paifa |=0x0 ; paifb |=WM8580_AIF_LENGTH_20 ;break ;case SNDRV_PCM_FORMAT_S24_LE : - paifa |=0x10 ; + paifa |=0x0 ; paifb |=WM8580_AIF_LENGTH_24 ;break ;case SNDRV_PCM_FORMAT_S32_LE : - paifa |=0x10 ; - paifb |=WM8580_AIF_LENGTH_24 ; + paifa |=0x0 ; + paifb |=WM8580_AIF_LENGTH_32 ;break ;default :return -EINVAL ;
sound/soc/codecs/wm8962.c +1 -1
@@ -3339,7 +3339,7 @@ static irqreturn_t wm8962_irq(int irq, void *data)int mask;int active; - mask =snd_soc_read (codec,WM8962_INTERRUPT_STATUS_2 ); + mask =snd_soc_read (codec,WM8962_INTERRUPT_STATUS_2_MASK ); active =snd_soc_read (codec,WM8962_INTERRUPT_STATUS_2 ); active &= ~mask;
sound/soc/codecs/wm_hubs.c +1 -1
@@ -293,7 +293,7 @@ SOC_DOUBLE_R("Speaker Switch",SOC_DOUBLE_R ("Speaker ZC Switch" ,WM8993_SPEAKER_VOLUME_LEFT ,WM8993_SPEAKER_VOLUME_RIGHT ,7 ,1 ,0 ), -SOC_DOUBLE_TLV ("Speaker Boost Volume" ,WM8993_SPKOUT_BOOST ,0 ,3 ,7 ,0 , +SOC_DOUBLE_TLV ("Speaker Boost Volume" ,WM8993_SPKOUT_BOOST ,3 ,0 ,7 ,0 , spkboost_tlv),SOC_ENUM ("Speaker Reference" , speaker_ref), SOC_ENUM("Speaker Mode", speaker_mode),
sound/soc/soc-core.c +9 -5
@@ -1619,12 +1619,14 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)#ifdef CONFIG_SND_SOC_AC97_BUS /* register any AC97 codecs */ for (i =0 ; i < card->num_rtd; i++) { - ret =soc_register_ac97_dai_link (&card->rtd[i]); -if (ret <0 ) { -printk (KERN_ERR "asoc: failed to register AC97 %s\n" , card->name); - goto probe_dai_err; - } + ret =soc_register_ac97_dai_link (&card->rtd[i]); +if (ret <0 ) { +printk (KERN_ERR "asoc: failed to register AC97 %s\n" , card->name); +while (--i >=0 ) +soc_unregister_ac97_dai_link (&card->rtd[i]); + goto probe_dai_err; } + }#endif card->instantiated =1 ;
@@ -3072,7 +3074,9 @@ int snd_soc_register_dais(struct device *dev,pr_debug ("Registered DAI '%s'\n" , dai->name); } +mutex_lock (&client_mutex);snd_soc_instantiate_cards (); +mutex_unlock (&client_mutex);return 0 ; err: