sound fixes
Subsystems (5)
Linus,
please pull ALSA updates for v2.6.34-rc5 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
This update again includes a bit bigger changes than usual. But all changes are pretty local, and mostly safe to apply.
Thanks!
Takashi
===
Huang Weiyi (1):
ASoC: wm2000: remove unused #include <linux/version.h>
Joerg Schirottke (1):
ALSA: hda - add a quirk for Clevo M570U laptop
Kailang Yang (2):
ALSA: hda - Fix auto-parser of ALC269vb for HP pin NID 0x21
ALSA: hda - Fix setup for ALC269vb amic and dmic models
Maurus Cuelenaere (1):
ALSA: hda: Add support for Medion WIM2160
Philby John (1):
ALSA: aaci - Fix alignment faults on ARM Cortex introduced by commit 29a4f2d3
Sascha Hauer (5):
ASoC: imx-ssi: honor IMX_SSI_DMA flag
ASoC: imx-pcm-dma-mx2: restart DMA after an error
ASoC: imx-ssi: Use a hrtimer in FIQ mode
ASoC: imx-ssi: increase minimum periods to 4
ASoC: imx-ssi: do not call hrtimer_disable in trigger function
Takashi Iwai (7):
ALSA: hda - Fix initial capture source connections of ALC880/260
ALSA: usb - Fix Oops after usb-midi disconnection
ALSA: hda - Enhance fix-up table for Realtek codecs
ALSA: hda - Add fix-up for Sony VAIO with ALC269
ALSA: hda - Fix control element allocations in VIA codec parser
ALSA: hda - Avoid invalid "Independent HP" control for VIA codecs
ALSA: hda - Add position_fix quirk for Biostar mobo
--- sound/arm/aaci.c | 7 +- sound/pci/hda/hda_intel.c | 1 + sound/pci/hda/patch_realtek.c | 170 +++++++++++++++++++++++++++++++++++---- sound/pci/hda/patch_via.c | 41 ++++++---- sound/soc/codecs/wm2000.c | 1 - sound/soc/imx/imx-pcm-dma-mx2.c | 15 +++- sound/soc/imx/imx-pcm-fiq.c | 55 +++++++------ sound/soc/imx/imx-ssi.c | 3 +- sound/usb/usbmidi.c | 24 ++++-- 9 files changed, 247 insertions(+), 70 deletions(-)
sound/arm/aaci.c +5 -2
@@ -863,7 +863,6 @@ static int __devinit aaci_probe_ac97(struct aaci *aaci)struct snd_ac97 *ac97;int ret; -writel (0 , aaci->base +AC97_POWERDOWN );/* * Assert AACIRESET for 2us */
@@ -1047,7 +1046,11 @@ static int __devinit aaci_probe(struct amba_device *dev, struct amba_id *id)writel (0x1fff , aaci->base +AACI_INTCLR );writel (aaci->maincr, aaci->base +AACI_MAINCR ); - +/* +* Fix: ac97 read back fail errors by reading +* from any arbitrary aaci register. +*/ +readl (aaci->base +AACI_CSCH1 ); ret =aaci_probe_ac97 (aaci);if (ret) goto out;
sound/pci/hda/hda_intel.c +1 -0
@@ -2272,6 +2272,7 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = {SND_PCI_QUIRK (0x1458 ,0xa022 ,"ga-ma770-ud3" ,POS_FIX_LPIB ),SND_PCI_QUIRK (0x1462 ,0x1002 ,"MSI Wind U115" ,POS_FIX_LPIB ),SND_PCI_QUIRK (0x1565 ,0x820f ,"Biostar Microtech" ,POS_FIX_LPIB ), +SND_PCI_QUIRK (0x1565 ,0x8218 ,"Biostar Microtech" ,POS_FIX_LPIB ), SND_PCI_QUIRK(0x8086, 0xd601, "eMachines T5212", POS_FIX_LPIB), {} };
sound/pci/hda/patch_realtek.c +154 -16
346 lines not on this page · raw message
sound/pci/hda/patch_via.c +24 -17
126 lines not on this page · raw message
sound/soc/codecs/wm2000.c +0 -1
@@ -23,7 +23,6 @@#include <linux/module.h> #include <linux/moduleparam.h> -#include <linux/version.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/firmware.h>
sound/soc/imx/imx-pcm-dma-mx2.c +14 -1
@@ -71,7 +71,12 @@ static void imx_ssi_dma_callback(int channel, void *data)static void snd_imx_dma_err_callback (int channel,void *data,int err) { -pr_err ("DMA error callback called\n" ); +struct snd_pcm_substream *substream = data; +struct snd_soc_pcm_runtime *rtd = substream->private_data; +struct imx_pcm_dma_params *dma_params = rtd->dai->cpu_dai->dma_data; +struct snd_pcm_runtime *runtime = substream->runtime; +struct imx_pcm_runtime_data *iprtd = runtime->private_data; +int ret; pr_err("DMA timeout on channel %d -%s%s%s%s\n", channel,
@@ -79,6 +84,14 @@ static void snd_imx_dma_err_callback(int channel, void *data, int err) err &IMX_DMA_ERR_REQUEST ?" request" :"" , err &IMX_DMA_ERR_TRANSFER ?" transfer" :"" , err & IMX_DMA_ERR_BUFFER ? " buffer" : ""); + +imx_dma_disable (iprtd->dma); + ret =imx_dma_setup_sg (iprtd->dma, iprtd->sg_list, iprtd->sg_count, +IMX_DMA_LENGTH_LOOP , dma_params->dma_addr, + substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ? +DMA_MODE_WRITE :DMA_MODE_READ ); +if (!ret) +imx_dma_enable (iprtd->dma); }static int imx_ssi_dma_alloc (struct snd_pcm_substream *substream)
sound/soc/imx/imx-pcm-fiq.c +29 -26
118 lines not on this page · raw message
sound/soc/imx/imx-ssi.c +2 -1
@@ -656,7 +656,8 @@ static int imx_ssi_probe(struct platform_device *pdev) dai->private_data = ssi;if ((cpu_is_mx27 () ||cpu_is_mx21 ()) && - !(ssi->flags &IMX_SSI_USE_AC97 )) { + !(ssi->flags &IMX_SSI_USE_AC97 ) && + (ssi->flags &IMX_SSI_DMA )) { ssi->flags |=IMX_SSI_DMA ; platform =imx_ssi_dma_mx2_init (pdev, ssi); }else
sound/usb/usbmidi.c +18 -6
@@ -986,6 +986,8 @@ static void snd_usbmidi_output_drain(struct snd_rawmidi_substream *substream)DEFINE_WAIT (wait);long timeout =msecs_to_jiffies (50 ); +if (ep->umidi->disconnected) +return ;/* * The substream buffer is empty, but some data might still be in the * currently active URBs, so we have to wait for those to complete.
@@ -1123,14 +1125,21 @@ static int snd_usbmidi_in_endpoint_create(struct snd_usb_midi* umidi,* Frees an output endpoint. * May be called when ep hasn't been initialized completely. */ -static void snd_usbmidi_out_endpoint_delete (struct snd_usb_midi_out_endpoint * ep) +static void snd_usbmidi_out_endpoint_clear (struct snd_usb_midi_out_endpoint *ep) {unsigned int i;for (i =0 ; i <OUTPUT_URBS ; ++i) -if (ep->urbs[i].urb) +if (ep->urbs[i].urb) {free_urb_and_buffer (ep->umidi, ep->urbs[i].urb, ep->max_transfer); + ep->urbs[i].urb =NULL ; + } +} + +static void snd_usbmidi_out_endpoint_delete (struct snd_usb_midi_out_endpoint *ep) +{ +snd_usbmidi_out_endpoint_clear (ep);kfree (ep); }
@@ -1262,15 +1271,18 @@ void snd_usbmidi_disconnect(struct list_head* p)usb_kill_urb (ep->out->urbs[j].urb);if (umidi->usb_protocol_ops->finish_out_endpoint) umidi->usb_protocol_ops->finish_out_endpoint (ep->out); + ep->out->active_urbs =0 ; +if (ep->out->drain_urbs) { + ep->out->drain_urbs =0 ; +wake_up (&ep->out->drain_wait); + } }if (ep->in)for (j =0 ; j <INPUT_URBS ; ++j)usb_kill_urb (ep->in->urbs[j]);/* free endpoints here; later call can result in Oops */ -if (ep->out) { -snd_usbmidi_out_endpoint_delete (ep->out); - ep->out =NULL ; - } +if (ep->out) +snd_usbmidi_out_endpoint_clear (ep->out);if (ep->in) {snd_usbmidi_in_endpoint_delete (ep->in); ep->in =NULL ;