aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Pargmann <mpa@pengutronix.de>2013-10-29 03:47:48 -0400
committerVinod Koul <vinod.koul@intel.com>2013-11-13 05:08:30 -0500
commitbb3660f130996d2653f123ee1ad802f11adbfb1c (patch)
tree52f0c9e2312f1f376937732548c17de8781ff008
parent702e94d66b555622ca6830de3095b5f0bb2ff6d7 (diff)
dma: mxs-dma: Update state after channel reset
After a channel reset, the channel stops running automatically. The state update was missing so that a channel perperation right after a channel reset failed. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
-rw-r--r--drivers/dma/mxs-dma.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c
index 530267068061..f48f87feeca4 100644
--- a/drivers/dma/mxs-dma.c
+++ b/drivers/dma/mxs-dma.c
@@ -235,6 +235,8 @@ static void mxs_dma_reset_chan(struct mxs_dma_chan *mxs_chan)
235 writel(1 << (chan_id + BP_APBHX_CHANNEL_CTRL_RESET_CHANNEL), 235 writel(1 << (chan_id + BP_APBHX_CHANNEL_CTRL_RESET_CHANNEL),
236 mxs_dma->base + HW_APBHX_CHANNEL_CTRL + STMP_OFFSET_REG_SET); 236 mxs_dma->base + HW_APBHX_CHANNEL_CTRL + STMP_OFFSET_REG_SET);
237 } 237 }
238
239 mxs_chan->status = DMA_COMPLETE;
238} 240}
239 241
240static void mxs_dma_enable_chan(struct mxs_dma_chan *mxs_chan) 242static void mxs_dma_enable_chan(struct mxs_dma_chan *mxs_chan)
@@ -362,7 +364,7 @@ static irqreturn_t mxs_dma_int_handler(int irq, void *dev_id)
362 chan); 364 chan);
363 mxs_chan->status = DMA_ERROR; 365 mxs_chan->status = DMA_ERROR;
364 mxs_dma_reset_chan(mxs_chan); 366 mxs_dma_reset_chan(mxs_chan);
365 } else { 367 } else if (mxs_chan->status != DMA_COMPLETE) {
366 if (mxs_chan->flags & MXS_DMA_SG_LOOP) 368 if (mxs_chan->flags & MXS_DMA_SG_LOOP)
367 mxs_chan->status = DMA_IN_PROGRESS; 369 mxs_chan->status = DMA_IN_PROGRESS;
368 else 370 else