Merge branch 'fix/asoc' into for-linus

3 files changed, 16 insertions, 12 deletions

diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index e814a9591f78..8ad9dc901007 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -297,7 +297,9 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
         omap_mcbsp_dai_dma_params[id][substream->stream].sync_mode = sync_mode;
         omap_mcbsp_dai_dma_params[id][substream->stream].data_type =
                                                         OMAP_DMA_DATA_TYPE_S16;
-        cpu_dai->dma_data = &omap_mcbsp_dai_dma_params[id][substream->stream];
+
+        snd_soc_dai_set_dma_data(cpu_dai, substream,
+                &omap_mcbsp_dai_dma_params[id][substream->stream]);
 
         if (mcbsp_data->configured) {
                 /* McBSP already configured by another stream */
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index 25f19e4728bf..b7f4f7e015f3 100644
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -150,7 +150,8 @@ static int omap_mcpdm_dai_hw_params(struct snd_pcm_substream *substream,
         int stream = substream->stream;
         int channels, err, link_mask = 0;
 
-        cpu_dai->dma_data = &omap_mcpdm_dai_dma_params[stream];
+        snd_soc_dai_set_dma_data(cpu_dai, substream,
+                                 &omap_mcpdm_dai_dma_params[stream]);
 
         channels = params_channels(params);
         switch (channels) {
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c
index 825db385f01f..39456447132c 100644
--- a/sound/soc/omap/omap-pcm.c
+++ b/sound/soc/omap/omap-pcm.c
@@ -60,12 +60,11 @@ static void omap_pcm_dma_irq(int ch, u16 stat, void *data)
         struct omap_runtime_data *prtd = runtime->private_data;
         unsigned long flags;
 
-        if ((cpu_is_omap1510()) &&
-                        (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)) {
+        if ((cpu_is_omap1510())) {
                 /*
                  * OMAP1510 doesn't fully support DMA progress counter
                  * and there is no software emulation implemented yet,
-                 * so have to maintain our own playback progress counter
+                 * so have to maintain our own progress counters
                  * that can be used by omap_pcm_pointer() instead.
                  */
                 spin_lock_irqsave(&prtd->lock, flags);
@@ -100,9 +99,11 @@ static int omap_pcm_hw_params(struct snd_pcm_substream *substream,
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct omap_runtime_data *prtd = runtime->private_data;
-        struct omap_pcm_dma_data *dma_data = rtd->dai->cpu_dai->dma_data;
+        struct omap_pcm_dma_data *dma_data;
         int err = 0;
 
+        dma_data = snd_soc_dai_get_dma_data(rtd->dai->cpu_dai, substream);
+
         /* return if this is a bufferless transfer e.g.
          * codec <--> BT codec or GSM modem -- lg FIXME */
         if (!dma_data)
@@ -189,8 +190,7 @@ static int omap_pcm_prepare(struct snd_pcm_substream *substream)
         dma_params.frame_count  = runtime->periods;
         omap_set_dma_params(prtd->dma_ch, &dma_params);
 
-        if ((cpu_is_omap1510()) &&
-                        (substream->stream == SNDRV_PCM_STREAM_PLAYBACK))
+        if ((cpu_is_omap1510()))
                 omap_enable_dma_irq(prtd->dma_ch, OMAP_DMA_FRAME_IRQ |
                               OMAP_DMA_LAST_IRQ | OMAP_DMA_BLOCK_IRQ);
         else
@@ -248,14 +248,15 @@ static snd_pcm_uframes_t omap_pcm_pointer(struct snd_pcm_substream *substream)
         dma_addr_t ptr;
         snd_pcm_uframes_t offset;
 
-        if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
+        if (cpu_is_omap1510()) {
+                offset = prtd->period_index * runtime->period_size;
+        } else if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
                 ptr = omap_get_dma_dst_pos(prtd->dma_ch);
                 offset = bytes_to_frames(runtime, ptr - runtime->dma_addr);
-        } else if (!(cpu_is_omap1510())) {
+        } else {
                 ptr = omap_get_dma_src_pos(prtd->dma_ch);
                 offset = bytes_to_frames(runtime, ptr - runtime->dma_addr);
-        } else
-                offset = prtd->period_index * runtime->period_size;
+        }
 
         if (offset >= runtime->buffer_size)
                 offset = 0;