Linus,
please pull sound fixes for v2.6.34-final from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
This last-minute fixes became bigger than I've thought, but they are
fairly safe to apply as small regression fixes and a MIPS-specific fix.
Thanks!
Takashi
===
Clemens Ladisch (1):
ALSA: virtuoso: fix Xonar D1/DX front panel microphone
Daniel T Chen (1):
ALSA: hda: Fix 0 dB for Lenovo models using Conexant CX20549 (Venice)
Takashi Iwai (4):
ALSA: hda - Fix mute-LED GPIO pin for HP dv series
ALSA: hda - Add hp-dv4 model for IDT 92HD71bx
ALSA: pcm - Use pgprot_noncached() for MIPS non-coherent archs
ALSA: ice1724 - Fix ESI Maya44 capture source control
---
sound/core/pcm_native.c | 7 +++++++
sound/pci/hda/patch_conexant.c | 7 ++++---
sound/pci/hda/patch_sigmatel.c | 15 +++++++++++++--
sound/pci/ice1712/maya44.c | 6 +++---
sound/pci/oxygen/xonar_cs43xx.c | 3 +++
5 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 8728876..20b5982 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -36,6 +36,9 @@
#include <sound/timer.h>
#include <sound/minors.h>
#include <asm/io.h>
+#if defined(CONFIG_MIPS) && defined(CONFIG_DMA_NONCOHERENT)
+#include <dma-coherence.h>
+#endif
/*
* Compatibility
@@ -3184,6 +3187,10 @@ static int snd_pcm_default_mmap(struct snd_pcm_substream *substream,
substream->runtime->dma_area,
substream->runtime->dma_addr,
area->vm_end - area->vm_start);
+#elif defined(CONFIG_MIPS) && defined(CONFIG_DMA_NONCOHERENT)
+ if (substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV &&
+ !plat_device_is_coherent(substream->dma_buffer.dev.dev))
+ area->vm_page_prot = pgprot_noncached(area->vm_page_prot);
#endif /* ARCH_HAS_DMA_MMAP_COHERENT */
/* mmap with fault handler */
area->vm_ops = &snd_pcm_vm_ops_data_fault;
diff ...
