The new DMA descriptor auto-loading feature (referred to
as sglist in the code) uses new registers.  Ensure they
are cleared.

Signed-off-by: Adrian Hunter <adrian.hun...@nokia.com>
CC: Venkatraman S <svenk...@ti.com>
CC: Madhusudhan C <madhu...@ti.com>
CC: Shilimkar Santosh <santosh.shilim...@ti.com>
CC: Tony Lindgren <t...@atomide.com>
---
 arch/arm/plat-omap/dma.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index 32a923a..a8264a0 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -1914,13 +1914,14 @@ void omap_clear_dma_sglist_mode(int lch)
 {
        /* Clear entire CDP which is related to sglist handling */
        p->dma_write(0, CDP, lch);
+       p->dma_write(0, CNDP, lch);
        p->dma_write(0, CCDN, lch);
-       /**
-        * Put back the original enabled irqs, which
-        * could have been overwritten by type 1 or type 2
-        * descriptors
+       /*
+        * CICR could have been overwritten by type 1 or type 2
+        * descriptors.  It is set up in omap_start_dma() anyway
+        * so just clear it to be on the safe side.
         */
-       p->dma_write(dma_chan[lch].enabled_irqs, CICR, lch);
+       p->dma_write(0, CICR, lch);
        return;
 }
 EXPORT_SYMBOL(omap_clear_dma_sglist_mode);
-- 
1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to