From 4105daadfa6f7a37e3e97f2331043e75c797439d Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Wed, 20 May 2009 16:58:30 +0300 Subject: [PATCH] --- yaml --- r: 172747 b: refs/heads/master c: bf07c9f2d869077cc918b4cda861eadac6df6283 h: refs/heads/master i: 172745: 63f99d733ae26ce591ed3e3fd97076fd4097868a 172743: 36923a2473637293903d79e90e39796ef2a599c8 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/dma.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f86a11f5c8a7..6ddab452f60b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb0cb2b815bf073dc0211ab224682a6caf6c89ce +refs/heads/master: bf07c9f2d869077cc918b4cda861eadac6df6283 diff --git a/trunk/arch/arm/plat-omap/dma.c b/trunk/arch/arm/plat-omap/dma.c index 1b5216f1e78d..8836da32d63b 100644 --- a/trunk/arch/arm/plat-omap/dma.c +++ b/trunk/arch/arm/plat-omap/dma.c @@ -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); } /*----------------------------------------------------------------------------*/