diff options
| author |   Peter Ujfalusi <peter.ujfalusi@ti.com> | 2014-09-16 22:45:57 +0300 |
|---|---|---|
| committer |   Vinod Koul <vinod.koul@intel.com> | 2014-09-23 18:22:55 +0530 |
| commit | bfb607451786829430ecdd5bcd51c5dac03e3639 (patch) | |
| tree | dd64ec7454cc54cb1d71d9e41695d307fa0b7e5b /drivers/dma | |
| parent | dmaengine: omap-dma: Add memory barrier to dma_resume path (diff) | |
| download | linux-dev-bfb607451786829430ecdd5bcd51c5dac03e3639.tar.xz linux-dev-bfb607451786829430ecdd5bcd51c5dac03e3639.zip | |
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/dma')
| -rw-r--r-- | drivers/dma/omap-dma.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c index c01ea505ee7c..bbea8243f9e8 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; } |