Merge remote-tracking branch 'asoc/topic/omap' into asoc-next

diff --combined sound/soc/omap/omap-pcm.c
index 99381a27295bbbd9452f0d0050c1509651373bff,eb81b9a2293ac967a3b220d200e6ed8940965949..a84f677234f08c5bd1ddaa7cd4a444111d4d8cf5
--- 1/sound/soc/omap/omap-pcm.c
--- 2/sound/soc/omap/omap-pcm.c
+++ b/sound/soc/omap/omap-pcm.c
@@@ -82,6 -82,8 +82,8 @@@ static int omap_pcm_hw_params(struct sn
        struct dma_chan *chan;
        int err = 0;
  
+       memset(&config, 0x00, sizeof(config));
+ 
        dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
  
        /* return if this is a bufferless transfer e.g.
@@@ -156,8 -158,10 +158,8 @@@ static int omap_pcm_mmap(struct snd_pcm
  {
        struct snd_pcm_runtime *runtime = substream->runtime;
  
 -      return dma_mmap_writecombine(substream->pcm->card->dev, vma,
 -                                   runtime->dma_area,
 -                                   runtime->dma_addr,
 -                                   runtime->dma_bytes);
 +      return dma_mmap_wc(substream->pcm->card->dev, vma, runtime->dma_area,
 +                         runtime->dma_addr, runtime->dma_bytes);
  }
  
  static struct snd_pcm_ops omap_pcm_ops = {
@@@ -181,7 -185,8 +183,7 @@@ static int omap_pcm_preallocate_dma_buf
        buf->dev.type = SNDRV_DMA_TYPE_DEV;
        buf->dev.dev = pcm->card->dev;
        buf->private_data = NULL;
 -      buf->area = dma_alloc_writecombine(pcm->card->dev, size,
 -                                         &buf->addr, GFP_KERNEL);
 +      buf->area = dma_alloc_wc(pcm->card->dev, size, &buf->addr, GFP_KERNEL);
        if (!buf->area)
                return -ENOMEM;
  
@@@ -204,7 -209,8 +206,7 @@@ static void omap_pcm_free_dma_buffers(s
                if (!buf->area)
                        continue;
  
 -              dma_free_writecombine(pcm->card->dev, buf->bytes,
 -                                    buf->area, buf->addr);
 +              dma_free_wc(pcm->card->dev, buf->bytes, buf->area, buf->addr);
                buf->area = NULL;
        }
  }