]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
OMAP: PM: Clear DMA channel state after a wakeup
authorAaro Koskinen <aaro.koskinen@nokia.com>
Wed, 20 May 2009 13:58:30 +0000 (16:58 +0300)
committerKevin Hilman <khilman@deeprootsystems.com>
Wed, 11 Nov 2009 22:42:26 +0000 (14:42 -0800)
Clear DMA channel states so that users can assume a known initial
state.

Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
arch/arm/plat-omap/dma.c

index 1b5216f1e78ddc427ce0fd3262324d2637d43203..8836da32d63b5a2fa9554ef659fce7552c76215b 100644 (file)
@@ -2358,6 +2358,8 @@ void omap_dma_global_context_save(void)
 
 void omap_dma_global_context_restore(void)
 {
+       int ch;
+
        dma_write(omap_dma_global_context.dma_gcr, GCR);
        dma_write(omap_dma_global_context.dma_ocp_sysconfig,
                OCP_SYSCONFIG);
@@ -2372,6 +2374,10 @@ void omap_dma_global_context_restore(void)
         */
        if (cpu_is_omap34xx() && (omap_type() != OMAP2_DEVICE_TYPE_GP))
                dma_write(0x3 , IRQSTATUS_L0);
+
+       for (ch = 0; ch < dma_chan_count; ch++)
+               if (dma_chan[ch].dev_id != -1)
+                       omap_clear_dma(ch);
 }
 
 /*----------------------------------------------------------------------------*/