summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-06-08 15:48:57 -0400
committerMike Frysinger <vapier@gentoo.org>2011-07-23 01:18:17 -0400
commite14062563cd5702c656fc9bee14165564341be2b (patch)
tree423b8d662d72ded14004d2f2ade42b8326fee68d
parentef0531b2e41fd2a0d0ba3ff3cb775947784cc278 (diff)
downloadop-kernel-dev-e14062563cd5702c656fc9bee14165564341be2b.zip
op-kernel-dev-e14062563cd5702c656fc9bee14165564341be2b.tar.gz
Blackfin: debug-mmrs: disable PERIPHERAL_MAP for IMDMA channels
The documentation for the IMDMA channels appears to be incorrect. These DMA blocks don't actually have PERIPHERAL_MAP MMRs for us to access. Attempts to do so lead to system mmr hardware errors. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--arch/blackfin/kernel/debug-mmrs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/blackfin/kernel/debug-mmrs.c b/arch/blackfin/kernel/debug-mmrs.c
index 40b3a64..26ebfe8 100644
--- a/arch/blackfin/kernel/debug-mmrs.c
+++ b/arch/blackfin/kernel/debug-mmrs.c
@@ -223,7 +223,8 @@ bfin_debug_mmrs_dma(struct dentry *parent, unsigned long base, int num, char mdm
__DMA(CURR_DESC_PTR, curr_desc_ptr);
__DMA(CURR_ADDR, curr_addr);
__DMA(IRQ_STATUS, irq_status);
- __DMA(PERIPHERAL_MAP, peripheral_map);
+ if (strcmp(pfx, "IMDMA") != 0)
+ __DMA(PERIPHERAL_MAP, peripheral_map);
__DMA(CURR_X_COUNT, curr_x_count);
__DMA(CURR_Y_COUNT, curr_y_count);
}
OpenPOWER on IntegriCloud