diff options
author | Wolfram Sang <w.sang@pengutronix.de> | 2011-08-25 09:54:55 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-31 04:42:08 -0400 |
commit | d4ba7854c9ea388e83731ee4b3c6546076f70f9d (patch) | |
tree | 443ad8eaf5cee135f485ae1a3e34882b2e6cc0f0 /sound/soc | |
parent | 18a4eef3d5a7ba0f96e5a7a84a5ab4827a52dffd (diff) |
ASoC: imx-ssi: use dma_writecombine consistently
If the channel is allocated as writecombine, then mmaping it should also
use writecombine. Also, add a proper device for the call. Ported from a
similar fix for mach-mxs.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/imx/imx-ssi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c index 10a8e2783751..3b8d5cd2516a 100644 --- a/sound/soc/imx/imx-ssi.c +++ b/sound/soc/imx/imx-ssi.c | |||
@@ -357,8 +357,8 @@ int snd_imx_pcm_mmap(struct snd_pcm_substream *substream, | |||
357 | struct snd_pcm_runtime *runtime = substream->runtime; | 357 | struct snd_pcm_runtime *runtime = substream->runtime; |
358 | int ret; | 358 | int ret; |
359 | 359 | ||
360 | ret = dma_mmap_coherent(NULL, vma, runtime->dma_area, | 360 | ret = dma_mmap_writecombine(substream->pcm->card->dev, vma, |
361 | runtime->dma_addr, runtime->dma_bytes); | 361 | runtime->dma_area, runtime->dma_addr, runtime->dma_bytes); |
362 | 362 | ||
363 | pr_debug("%s: ret: %d %p 0x%08x 0x%08x\n", __func__, ret, | 363 | pr_debug("%s: ret: %d %p 0x%08x 0x%08x\n", __func__, ret, |
364 | runtime->dma_area, | 364 | runtime->dma_area, |