From: Wolfram Sang Date: Thu, 25 Aug 2011 13:54:55 +0000 (+0200) Subject: ASoC: imx-ssi: use dma_writecombine consistently X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d4ba7854c9ea388e83731ee4b3c6546076f70f9d;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git 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 Acked-by: Sascha Hauer Acked-by: Liam Girdwood Signed-off-by: Mark Brown --- 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,