From d4732a175aa087f8fcd746847eb25a5fdce9124c Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 12 May 2010 10:32:42 +0200
Subject: [PATCH] --- yaml --- r: 190827 b: refs/heads/master c:
 9fe17b5d47d3d3c85b35623dea8f571a184134c0 h: refs/heads/master i:   190825:
 50455215a006a3a1d0b5c163dec8bc4ad942f8c7   190823:
 fa67653afbd35c85cfae8e3a47830d8c35232623 v: v3

---
 [refs]                        | 2 +-
 trunk/sound/core/pcm_native.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5ca66aa2e636..731bb94e46f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a45f7822544c54a2cf070d84f4e85f2fb32ec02
+refs/heads/master: 9fe17b5d47d3d3c85b35623dea8f571a184134c0
diff --git a/trunk/sound/core/pcm_native.c b/trunk/sound/core/pcm_native.c
index 872887624030..20b5982c996b 100644
--- a/trunk/sound/core/pcm_native.c
+++ b/trunk/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;