[PATCH 03/22] OMAP: DMA: Ensure the sglist registers are cleared
From: Adrian Hunter <hidden>
Date: 2011-05-05 11:51:03
Also in:
linux-mmc, linux-omap
Subsystem:
arm port, the rest · Maintainers:
Russell King, Linus Torvalds
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 <redacted> CC: Venkatraman S <redacted> CC: Madhusudhan C <redacted> CC: Shilimkar Santosh <redacted> CC: Tony Lindgren <tony@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