2 files changed, 18 insertions, 5 deletions

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 128714622bf5..14867e3ac8ff 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -255,6 +255,7 @@ struct sdma_channel {
         enum dma_slave_buswidth         word_size;
         unsigned int                    buf_tail;
         unsigned int                    num_bd;
+        unsigned int                    period_len;
         struct sdma_buffer_descriptor   *bd;
         dma_addr_t                      bd_phys;
         unsigned int                    pc_from_device, pc_to_device;
@@ -593,6 +594,12 @@ static void sdma_event_disable(struct sdma_channel *sdmac, unsigned int event)
 
 static void sdma_handle_channel_loop(struct sdma_channel *sdmac)
 {
+        if (sdmac->desc.callback)
+                sdmac->desc.callback(sdmac->desc.callback_param);
+}
+
+static void sdma_update_channel_loop(struct sdma_channel *sdmac)
+{
         struct sdma_buffer_descriptor *bd;
 
         /*
@@ -611,9 +618,6 @@ static void sdma_handle_channel_loop(struct sdma_channel *sdmac)
                 bd->mode.status |= BD_DONE;
                 sdmac->buf_tail++;
                 sdmac->buf_tail %= sdmac->num_bd;
-
-                if (sdmac->desc.callback)
-                        sdmac->desc.callback(sdmac->desc.callback_param);
         }
 }
 
@@ -669,6 +673,9 @@ static irqreturn_t sdma_int_handler(int irq, void *dev_id)
                 int channel = fls(stat) - 1;
                 struct sdma_channel *sdmac = &sdma->channel[channel];
 
+                if (sdmac->flags & IMX_DMA_SG_LOOP)
+                        sdma_update_channel_loop(sdmac);
+
                 tasklet_schedule(&sdmac->tasklet);
 
                 __clear_bit(channel, &stat);
@@ -1129,6 +1136,7 @@ static struct dma_async_tx_descriptor *sdma_prep_dma_cyclic(
         sdmac->status = DMA_IN_PROGRESS;
 
         sdmac->buf_tail = 0;
+        sdmac->period_len = period_len;
 
         sdmac->flags |= IMX_DMA_SG_LOOP;
         sdmac->direction = direction;
@@ -1225,9 +1233,15 @@ static enum dma_status sdma_tx_status(struct dma_chan *chan,
                                       struct dma_tx_state *txstate)
 {
         struct sdma_channel *sdmac = to_sdma_chan(chan);
+        u32 residue;
+
+        if (sdmac->flags & IMX_DMA_SG_LOOP)
+                residue = (sdmac->num_bd - sdmac->buf_tail) * sdmac->period_len;
+        else
+                residue = sdmac->chn_count - sdmac->chn_real_count;
 
         dma_set_tx_state(txstate, chan->completed_cookie, chan->cookie,
-                        sdmac->chn_count - sdmac->chn_real_count);
+                         residue);
 
         return sdmac->status;
 }
diff --git a/sound/soc/fsl/imx-pcm-dma.c b/sound/soc/fsl/imx-pcm-dma.c
index 0849b7b83f0a..0db94f492e97 100644
--- a/sound/soc/fsl/imx-pcm-dma.c
+++ b/sound/soc/fsl/imx-pcm-dma.c
@@ -59,7 +59,6 @@ int imx_pcm_dma_init(struct platform_device *pdev)
 {
         return devm_snd_dmaengine_pcm_register(&pdev->dev,
                 &imx_dmaengine_pcm_config,
-                SND_DMAENGINE_PCM_FLAG_NO_RESIDUE |
                 SND_DMAENGINE_PCM_FLAG_COMPAT);
 }
 EXPORT_SYMBOL_GPL(imx_pcm_dma_init);