From: Jun Nie <jun.nie@linaro.org>
Date: Wed, 5 Aug 2015 05:23:27 +0000 (+0800)
Subject: dmaengine: zxdma: Fix force stop bug
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ed9c87b33147e5b007e66a282b9c8c307fbf8bf9;p=linux-beck.git

dmaengine: zxdma: Fix force stop bug

DMA will not stop when clearing enable bit till all transaction
is done. The bug is exposed in audio playback because ring DMA
chain never stop. Force hardware to stop with setting FORCE bit.

Signed-off-by: Jun Nie <jun.nie@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---

diff --git a/drivers/dma/zx296702_dma.c b/drivers/dma/zx296702_dma.c
index 103691c61613..39915a6b7986 100644
--- a/drivers/dma/zx296702_dma.c
+++ b/drivers/dma/zx296702_dma.c
@@ -144,6 +144,7 @@ static void zx_dma_terminate_chan(struct zx_dma_phy *phy, struct zx_dma_dev *d)
 
 	val = readl_relaxed(phy->base + REG_ZX_CTRL);
 	val &= ~ZX_CH_ENABLE;
+	val |= ZX_FORCE_CLOSE;
 	writel_relaxed(val, phy->base + REG_ZX_CTRL);
 
 	val = 0x1 << phy->idx;