diff options
| author | Michael Hennerich <michael.hennerich@analog.com> | 2009-10-20 15:38:04 +0200 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-11-25 08:35:33 +0100 |
| commit | 865bddfbf70d9ba04638c15ef49f17b599d9bbf3 (patch) | |
| tree | 32390bee517934693940b5c502f3d241bbb3b770 | |
| parent | Merge branch 'i2c-pnx-fixes' of git://git.fluff.org/bjdooks/linux (diff) | |
| download | linux-865bddfbf70d9ba04638c15ef49f17b599d9bbf3.tar.xz linux-865bddfbf70d9ba04638c15ef49f17b599d9bbf3.zip | |
Blackfin: fix suspend/resume failure with some on-chip ROMs
Some Blackfin on-chip ROMs utilize some MDMA channels during the suspend
and resume process, but don't clean up after themselves. So manually
clear all DMA channels when resuming since no DMA could have been running
at this point in time. Now Linux should be able to work regardless of any
laziness on the part of the on-chip ROM or boot loader.
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| -rw-r--r-- | arch/blackfin/kernel/bfin_dma_5xx.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/blackfin/kernel/bfin_dma_5xx.c b/arch/blackfin/kernel/bfin_dma_5xx.c index 1f170216d2f9..3946aff4f414 100644 --- a/arch/blackfin/kernel/bfin_dma_5xx.c +++ b/arch/blackfin/kernel/bfin_dma_5xx.c @@ -225,8 +225,13 @@ int blackfin_dma_suspend(void) void blackfin_dma_resume(void) { int i; - for (i = 0; i < MAX_DMA_SUSPEND_CHANNELS; ++i) - dma_ch[i].regs->peripheral_map = dma_ch[i].saved_peripheral_map; + + for (i = 0; i < MAX_DMA_CHANNELS; ++i) { + dma_ch[i].regs->cfg = 0; + + if (i < MAX_DMA_SUSPEND_CHANNELS) + dma_ch[i].regs->peripheral_map = dma_ch[i].saved_peripheral_map; + } } #endif |