summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2014-09-16 22:45:57 +0300
committerVinod Koul <vinod.koul@intel.com>2014-09-23 18:22:55 +0530
commitbfb607451786829430ecdd5bcd51c5dac03e3639 (patch)
treedd64ec7454cc54cb1d71d9e41695d307fa0b7e5b /drivers
parentb3d09da7e1771decc6833d1fa662bf994948c8e6 (diff)
downloadop-kernel-dev-bfb607451786829430ecdd5bcd51c5dac03e3639.zip
op-kernel-dev-bfb607451786829430ecdd5bcd51c5dac03e3639.tar.gz
dmaengine: omap-dma: Restore the CLINK_CTRL in resume path
When the audio stream is paused or suspended we stop the sDMA and when it is unpaused/resumed we start the channel without reconfiguring it. The omap_dma_stop() clears the link configuration when we pause the dma, but it is not setting it back on start. This will result only one audio buffer to be played back and the DMA will stop, since the linking is disabled. We need to restore the CLINK_CTRL register in case of resume. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/dma/omap-dma.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c
index c01ea50..bbea824 100644
--- a/drivers/dma/omap-dma.c
+++ b/drivers/dma/omap-dma.c
@@ -1019,6 +1019,9 @@ static int omap_dma_resume(struct omap_chan *c)
if (c->paused) {
mb();
+ /* Restore channel link register */
+ omap_dma_chan_write(c, CLNK_CTRL, c->desc->clnk_ctrl);
+
omap_dma_start(c, c->desc);
c->paused = false;
}
OpenPOWER on IntegriCloud