diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2011-08-25 15:54:55 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-31 09:42:08 +0100 |
| commit | d4ba7854c9ea388e83731ee4b3c6546076f70f9d (patch) | |
| tree | 443ad8eaf5cee135f485ae1a3e34882b2e6cc0f0 /sound | |
| parent | 18a4eef3d5a7ba0f96e5a7a84a5ab4827a52dffd (diff) | |
| download | linux-3.10-d4ba7854c9ea388e83731ee4b3c6546076f70f9d.tar.gz linux-3.10-d4ba7854c9ea388e83731ee4b3c6546076f70f9d.tar.bz2 linux-3.10-d4ba7854c9ea388e83731ee4b3c6546076f70f9d.zip | |
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')
| -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 10a8e278375..3b8d5cd2516 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, struct snd_pcm_runtime *runtime = substream->runtime; int ret; - ret = dma_mmap_coherent(NULL, vma, runtime->dma_area, - runtime->dma_addr, runtime->dma_bytes); + ret = dma_mmap_writecombine(substream->pcm->card->dev, vma, + runtime->dma_area, runtime->dma_addr, runtime->dma_bytes); pr_debug("%s: ret: %d %p 0x%08x 0x%08x\n", __func__, ret, runtime->dma_area, |