sound fixes
Subsystems (5)
Linus,
please pull sound fixes for v2.6.38-rc7 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
All small and simple changes.
Thanks!
Takashi
===
David Henningsson (3):
ALSA: HDA: Fix mic initialization in VIA auto parser
ALSA: HDA: Add a new Conexant codec 506e (20590)
ALSA: HDA: Add ideapad quirk for two Dell machines
Dmitry Eremin-Solenikov (1):
ASoC: correct pxa AC97 DAI names
Eric Bénard (1):
eukrea-tlv320: fix platform_name
Lu Guanqun (1):
ALSA: fix one memory leak in sound jack
Mark Brown (3):
ASoC: Fix WM8958 default microphone detection argument ordering
ASoC: Correct definition of WM8903_VMID_RES_5K
ASoC: Hook wm_hubs micbiases up to CLK_SYS
Takashi Iwai (1):
ALSA: usb-audio: fix oops due to cleanup race when disconnecting
Vitaliy Kulikov (1):
ALSA: hda - Add support for new IDT 92HD98 and 92HD99 codecs
--- sound/core/jack.c | 1 + sound/pci/hda/patch_conexant.c | 5 +++++ sound/pci/hda/patch_sigmatel.c | 15 ++++++++++++--- sound/pci/hda/patch_via.c | 2 +- sound/soc/codecs/wm8903.h | 2 +- sound/soc/codecs/wm8994.c | 5 ++--- sound/soc/codecs/wm_hubs.c | 3 +++ sound/soc/imx/eukrea-tlv320.c | 2 +- sound/soc/pxa/e740_wm9705.c | 4 ++-- sound/soc/pxa/e750_wm9705.c | 4 ++-- sound/soc/pxa/e800_wm9712.c | 4 ++-- sound/soc/pxa/em-x270.c | 4 ++-- sound/soc/pxa/mioa701_wm9713.c | 4 ++-- sound/soc/pxa/palm27x.c | 4 ++-- sound/soc/pxa/tosa.c | 4 ++-- sound/soc/pxa/zylonite.c | 4 ++-- sound/usb/card.c | 4 ++++ sound/usb/pcm.c | 7 +++++-- sound/usb/usbaudio.h | 1 + 19 files changed, 52 insertions(+), 27 deletions(-)
sound/core/jack.c +1 -0
@@ -141,6 +141,7 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, fail_input:input_free_device (jack->input_dev); +kfree (jack->id);kfree (jack);return err; }
sound/pci/hda/patch_conexant.c +5 -0
@@ -3114,6 +3114,8 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = {SND_PCI_QUIRK (0x1028 ,0x0401 ,"Dell Vostro 1014" ,CXT5066_DELL_VOSTRO ),SND_PCI_QUIRK (0x1028 ,0x0402 ,"Dell Vostro" ,CXT5066_DELL_VOSTRO ),SND_PCI_QUIRK (0x1028 ,0x0408 ,"Dell Inspiron One 19T" ,CXT5066_IDEAPAD ), +SND_PCI_QUIRK (0x1028 ,0x050f ,"Dell Inspiron" ,CXT5066_IDEAPAD ), +SND_PCI_QUIRK (0x1028 ,0x0510 ,"Dell Vostro" ,CXT5066_IDEAPAD ),SND_PCI_QUIRK (0x103c ,0x360b ,"HP G60" ,CXT5066_HP_LAPTOP ),SND_PCI_QUIRK (0x1043 ,0x13f3 ,"Asus A52J" ,CXT5066_ASUS ), SND_PCI_QUIRK(0x1043, 0x1643, "Asus K52JU", CXT5066_ASUS),
@@ -3937,6 +3939,8 @@ static struct hda_codec_preset snd_hda_preset_conexant[] = { .patch = patch_cxt5066 }, { .id = 0x14f15069, .name = "CX20585", .patch = patch_cxt5066 }, + { .id = 0x14f1506e, .name = "CX20590", + .patch = patch_cxt5066 }, { .id = 0x14f15097, .name = "CX20631", .patch = patch_conexant_auto }, { .id = 0x14f15098, .name = "CX20632",
@@ -3963,6 +3967,7 @@ MODULE_ALIAS("snd-hda-codec-id:14f15066");MODULE_ALIAS ("snd-hda-codec-id:14f15067" );MODULE_ALIAS ("snd-hda-codec-id:14f15068" );MODULE_ALIAS ("snd-hda-codec-id:14f15069" ); +MODULE_ALIAS ("snd-hda-codec-id:14f1506e" );MODULE_ALIAS ("snd-hda-codec-id:14f15097" );MODULE_ALIAS ("snd-hda-codec-id:14f15098" );MODULE_ALIAS ("snd-hda-codec-id:14f150a1" );
sound/pci/hda/patch_sigmatel.c +12 -3
@@ -586,7 +586,12 @@ static hda_nid_t stac92hd83xxx_pin_nids[10] = { 0x0f, 0x10, 0x11, 0x1f, 0x20, }; -static hda_nid_t stac92hd88xxx_pin_nids[10 ] = { +static hda_nid_t stac92hd87xxx_pin_nids[6 ] = { +0x0a ,0x0b ,0x0c ,0x0d , +0x0f ,0x11 , +}; + +static hda_nid_t stac92hd88xxx_pin_nids[8 ] = {0x0a ,0x0b ,0x0c ,0x0d ,0x0f ,0x11 ,0x1f ,0x20 , };
@@ -5430,12 +5435,13 @@ again:switch (codec->vendor_id) {case 0x111d76d1 :case 0x111d76d9 : +case 0x111d76e5 : spec->dmic_nids = stac92hd87b_dmic_nids; spec->num_dmics =stac92xx_connected_ports (codec, stac92hd87b_dmic_nids,STAC92HD87B_NUM_DMICS ); - spec->num_pins =ARRAY_SIZE (stac92hd88xxx_pin_nids); - spec->pin_nids = stac92hd88xxx_pin_nids; + spec->num_pins =ARRAY_SIZE (stac92hd87xxx_pin_nids); + spec->pin_nids = stac92hd87xxx_pin_nids; spec->mono_nid =0 ; spec->num_pwrs =0 ;break ;
@@ -5443,6 +5449,7 @@ again:case 0x111d7667 :case 0x111d7668 :case 0x111d7669 : +case 0x111d76e3 : spec->num_dmics =stac92xx_connected_ports (codec, stac92hd88xxx_dmic_nids,STAC92HD88XXX_NUM_DMICS );
@@ -6387,6 +6394,8 @@ static struct hda_codec_preset snd_hda_preset_sigmatel[] = { { .id = 0x111d76cd, .name = "92HD89F2", .patch = patch_stac92hd73xx }, { .id = 0x111d76ce, .name = "92HD89F1", .patch = patch_stac92hd73xx }, { .id = 0x111d76e0, .name = "92HD91BXX", .patch = patch_stac92hd83xxx}, + { .id = 0x111d76e3, .name = "92HD98BXX", .patch = patch_stac92hd83xxx}, + { .id = 0x111d76e5, .name = "92HD99BXX", .patch = patch_stac92hd83xxx}, { .id = 0x111d76e7, .name = "92HD90BXX", .patch = patch_stac92hd83xxx}, {}/* terminator */ };
sound/pci/hda/patch_via.c +1 -1
@@ -567,7 +567,7 @@ static void via_auto_init_analog_input(struct hda_codec *codec)hda_nid_t nid = cfg->inputs[i].pin;if (spec->smart51_enabled &&is_smart51_pins (spec, nid)) ctl =PIN_OUT ; -else if (i ==AUTO_PIN_MIC ) +else if (cfg->inputs[i].type ==AUTO_PIN_MIC ) ctl =PIN_VREF50 ;else ctl =PIN_IN ;
sound/soc/codecs/wm8903.h +1 -1
@@ -165,7 +165,7 @@ extern int wm8903_mic_detect(struct snd_soc_codec *codec,#define WM8903_VMID_RES_50K 2#define WM8903_VMID_RES_250K 3 -#define WM8903_VMID_RES_5K 4 +#define WM8903_VMID_RES_5K 6/* * R8 (0x08) - Analogue DAC 0
sound/soc/codecs/wm8994.c +2 -3
@@ -3000,11 +3000,10 @@ static void wm8958_default_micdet(u16 status, void *data) report |=SND_JACK_BTN_5 ; done: -snd_soc_jack_report (wm8994->micdet[0 ].jack, +snd_soc_jack_report (wm8994->micdet[0 ].jack, report,SND_JACK_BTN_0 |SND_JACK_BTN_1 |SND_JACK_BTN_2 |SND_JACK_BTN_3 |SND_JACK_BTN_4 |SND_JACK_BTN_5 | -SND_JACK_MICROPHONE |SND_JACK_VIDEOOUT , - report); +SND_JACK_MICROPHONE |SND_JACK_VIDEOOUT ); }/**
sound/soc/codecs/wm_hubs.c +3 -0
@@ -674,6 +674,9 @@ SND_SOC_DAPM_OUTPUT("LINEOUT2N"), };static const struct snd_soc_dapm_route analogue_routes[] = { + {"MICBIAS1" ,NULL ,"CLK_SYS" }, + {"MICBIAS2" ,NULL ,"CLK_SYS" }, + {"IN1L PGA" ,"IN1LP Switch" ,"IN1LP" }, {"IN1L PGA" ,"IN1LN Switch" ,"IN1LN" },
sound/soc/imx/eukrea-tlv320.c +1 -1
@@ -79,7 +79,7 @@ static struct snd_soc_dai_link eukrea_tlv320_dai = { .name = "tlv320aic23", .stream_name = "TLV320AIC23", .codec_dai_name = "tlv320aic23-hifi", - .platform_name = "imx-pcm-audio.0", + .platform_name = "imx-fiq-pcm-audio.0", .codec_name = "tlv320aic23-codec.0-001a", .cpu_dai_name = "imx-ssi.0", .ops = &eukrea_tlv320_snd_ops,
sound/soc/pxa/e740_wm9705.c +2 -2
@@ -117,7 +117,7 @@ static struct snd_soc_dai_link e740_dai[] = { { .name = "AC97", .stream_name = "AC97 HiFi", - .cpu_dai_name = "pxa-ac97.0", + .cpu_dai_name = "pxa2xx-ac97", .codec_dai_name = "wm9705-hifi", .platform_name = "pxa-pcm-audio", .codec_name = "wm9705-codec",
@@ -126,7 +126,7 @@ static struct snd_soc_dai_link e740_dai[] = { { .name = "AC97 Aux", .stream_name = "AC97 Aux", - .cpu_dai_name = "pxa-ac97.1", + .cpu_dai_name = "pxa2xx-ac97-aux", .codec_dai_name = "wm9705-aux", .platform_name = "pxa-pcm-audio", .codec_name = "wm9705-codec",
sound/soc/pxa/e750_wm9705.c +2 -2
@@ -99,7 +99,7 @@ static struct snd_soc_dai_link e750_dai[] = { { .name = "AC97", .stream_name = "AC97 HiFi", - .cpu_dai_name = "pxa-ac97.0", + .cpu_dai_name = "pxa2xx-ac97", .codec_dai_name = "wm9705-hifi", .platform_name = "pxa-pcm-audio", .codec_name = "wm9705-codec",
@@ -109,7 +109,7 @@ static struct snd_soc_dai_link e750_dai[] = { { .name = "AC97 Aux", .stream_name = "AC97 Aux", - .cpu_dai_name = "pxa-ac97.1", + .cpu_dai_name = "pxa2xx-ac97-aux", .codec_dai_name ="wm9705-aux", .platform_name = "pxa-pcm-audio", .codec_name = "wm9705-codec",
sound/soc/pxa/e800_wm9712.c +2 -2
@@ -89,7 +89,7 @@ static struct snd_soc_dai_link e800_dai[] = { { .name = "AC97", .stream_name = "AC97 HiFi", - .cpu_dai_name = "pxa-ac97.0", + .cpu_dai_name = "pxa2xx-ac97", .codec_dai_name = "wm9712-hifi", .platform_name = "pxa-pcm-audio", .codec_name = "wm9712-codec",
@@ -98,7 +98,7 @@ static struct snd_soc_dai_link e800_dai[] = { { .name = "AC97 Aux", .stream_name = "AC97 Aux", - .cpu_dai_name = "pxa-ac97.1", + .cpu_dai_name = "pxa2xx-ac97-aux", .codec_dai_name ="wm9712-aux", .platform_name = "pxa-pcm-audio", .codec_name = "wm9712-codec",
sound/soc/pxa/em-x270.c +2 -2
@@ -37,7 +37,7 @@ static struct snd_soc_dai_link em_x270_dai[] = { { .name = "AC97", .stream_name = "AC97 HiFi", - .cpu_dai_name = "pxa-ac97.0", + .cpu_dai_name = "pxa2xx-ac97", .codec_dai_name = "wm9712-hifi", .platform_name = "pxa-pcm-audio", .codec_name = "wm9712-codec",
@@ -45,7 +45,7 @@ static struct snd_soc_dai_link em_x270_dai[] = { { .name = "AC97 Aux", .stream_name = "AC97 Aux", - .cpu_dai_name = "pxa-ac97.1", + .cpu_dai_name = "pxa2xx-ac97-aux", .codec_dai_name ="wm9712-aux", .platform_name = "pxa-pcm-audio", .codec_name = "wm9712-codec",
sound/soc/pxa/mioa701_wm9713.c +2 -2
@@ -162,7 +162,7 @@ static struct snd_soc_dai_link mioa701_dai[] = { { .name = "AC97", .stream_name = "AC97 HiFi", - .cpu_dai_name = "pxa-ac97.0", + .cpu_dai_name = "pxa2xx-ac97", .codec_dai_name = "wm9713-hifi", .codec_name = "wm9713-codec", .init = mioa701_wm9713_init,
@@ -172,7 +172,7 @@ static struct snd_soc_dai_link mioa701_dai[] = { { .name = "AC97 Aux", .stream_name = "AC97 Aux", - .cpu_dai_name = "pxa-ac97.1", + .cpu_dai_name = "pxa2xx-ac97-aux", .codec_dai_name ="wm9713-aux", .codec_name = "wm9713-codec", .platform_name = "pxa-pcm-audio",
sound/soc/pxa/palm27x.c +2 -2
@@ -132,7 +132,7 @@ static struct snd_soc_dai_link palm27x_dai[] = { { .name = "AC97 HiFi", .stream_name = "AC97 HiFi", - .cpu_dai_name = "pxa-ac97.0", + .cpu_dai_name = "pxa2xx-ac97", .codec_dai_name = "wm9712-hifi", .codec_name = "wm9712-codec", .platform_name = "pxa-pcm-audio",
@@ -141,7 +141,7 @@ static struct snd_soc_dai_link palm27x_dai[] = { { .name = "AC97 Aux", .stream_name = "AC97 Aux", - .cpu_dai_name = "pxa-ac97.1", + .cpu_dai_name = "pxa2xx-ac97-aux", .codec_dai_name = "wm9712-aux", .codec_name = "wm9712-codec", .platform_name = "pxa-pcm-audio",
sound/soc/pxa/tosa.c +2 -2
@@ -219,7 +219,7 @@ static struct snd_soc_dai_link tosa_dai[] = { { .name = "AC97", .stream_name = "AC97 HiFi", - .cpu_dai_name = "pxa-ac97.0", + .cpu_dai_name = "pxa2xx-ac97", .codec_dai_name = "wm9712-hifi", .platform_name = "pxa-pcm-audio", .codec_name = "wm9712-codec",
@@ -229,7 +229,7 @@ static struct snd_soc_dai_link tosa_dai[] = { { .name = "AC97 Aux", .stream_name = "AC97 Aux", - .cpu_dai_name = "pxa-ac97.1", + .cpu_dai_name = "pxa2xx-ac97-aux", .codec_dai_name = "wm9712-aux", .platform_name = "pxa-pcm-audio", .codec_name = "wm9712-codec",
sound/soc/pxa/zylonite.c +2 -2
@@ -166,7 +166,7 @@ static struct snd_soc_dai_link zylonite_dai[] = { .stream_name = "AC97 HiFi", .codec_name = "wm9713-codec", .platform_name = "pxa-pcm-audio", - .cpu_dai_name = "pxa-ac97.0", + .cpu_dai_name = "pxa2xx-ac97", .codec_name = "wm9713-hifi", .init = zylonite_wm9713_init, },
@@ -175,7 +175,7 @@ static struct snd_soc_dai_link zylonite_dai[] = { .stream_name = "AC97 Aux", .codec_name = "wm9713-codec", .platform_name = "pxa-pcm-audio", - .cpu_dai_name = "pxa-ac97.1", + .cpu_dai_name = "pxa2xx-ac97-aux", .codec_name = "wm9713-aux", }, {
sound/usb/card.c +4 -0
@@ -323,6 +323,7 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx,return -ENOMEM ; } +mutex_init (&chip->shutdown_mutex); chip->index = idx; chip->dev = dev; chip->card = card;
@@ -531,6 +532,7 @@ static void snd_usb_audio_disconnect(struct usb_device *dev, void *ptr) chip = ptr; card = chip->card;mutex_lock (®ister_mutex); +mutex_lock (&chip->shutdown_mutex); chip->shutdown =1 ; chip->num_interfaces--;if (chip->num_interfaces <=0 ) {
@@ -548,9 +550,11 @@ static void snd_usb_audio_disconnect(struct usb_device *dev, void *ptr)snd_usb_mixer_disconnect (p); } usb_chip[chip->index] =NULL ; +mutex_unlock (&chip->shutdown_mutex);mutex_unlock (®ister_mutex);snd_card_free_when_closed (card); }else { +mutex_unlock (&chip->shutdown_mutex);mutex_unlock (®ister_mutex); } }
sound/usb/pcm.c +5 -2
@@ -361,6 +361,7 @@ static int snd_usb_hw_params(struct snd_pcm_substream *substream, }if (changed) { +mutex_lock (&subs->stream->chip->shutdown_mutex);/* format changed */ snd_usb_release_substream_urbs (subs,0 );/* influenced: period_bytes, channels, rate, format, */
@@ -368,6 +369,7 @@ static int snd_usb_hw_params(struct snd_pcm_substream *substream,params_rate (hw_params),snd_pcm_format_physical_width (params_format (hw_params)) * params_channels(hw_params)); +mutex_unlock (&subs->stream->chip->shutdown_mutex); }return ret;
@@ -385,8 +387,9 @@ static int snd_usb_hw_free(struct snd_pcm_substream *substream) subs->cur_audiofmt =NULL ; subs->cur_rate =0 ; subs->period_bytes =0 ; -if (!subs->stream->chip->shutdown) -snd_usb_release_substream_urbs (subs,0 ); +mutex_lock (&subs->stream->chip->shutdown_mutex); +snd_usb_release_substream_urbs (subs,0 ); +mutex_unlock (&subs->stream->chip->shutdown_mutex);return snd_pcm_lib_free_vmalloc_buffer (substream); }
sound/usb/usbaudio.h +1 -0
@@ -36,6 +36,7 @@ struct snd_usb_audio {struct snd_card *card;u32 usb_id;int shutdown; +struct mutex shutdown_mutex; unsigned int txfr_quirk:1; /* Subframe boundaries on transfers */int num_interfaces;int num_suspended_intf;