aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@stericsson.com>2010-06-22 21:06:42 -0400
committerDan Williams <dan.j.williams@intel.com>2010-06-22 21:06:42 -0400
commitf41855929c9fdc3b4f2863ada9df3e0cf4231b5b (patch)
tree4a31c0bd50af7c13664352e929edcdd2bd5bbf26 /arch/arm/mach-ux500
parent6b7acd84426235c63a3c0f0b230a95064f97b0d4 (diff)
DMAENGINE: ste_dma40: support older silicon
This makes sure the DMA40 driver will also work on the oldest silicon revisions that have the on-chip memory on another location in the DB8500 and also requires explicit suspend before starting or resuming a logical channel. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> [added parenthesis to the definition of U8500_DMA_LCPA_BASE_ED] Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'arch/arm/mach-ux500')
-rw-r--r--arch/arm/mach-ux500/devices-db8500.c2
-rw-r--r--arch/arm/mach-ux500/include/mach/db8500-regs.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c
index e2b7c31ef372..c62cdbee3bd9 100644
--- a/arch/arm/mach-ux500/devices-db8500.c
+++ b/arch/arm/mach-ux500/devices-db8500.c
@@ -213,4 +213,6 @@ void dma40_u8500ed_fixup(void)
213 dma40_plat_data.memcpy_len = 0; 213 dma40_plat_data.memcpy_len = 0;
214 dma40_resources[0].start = U8500_DMA_BASE_ED; 214 dma40_resources[0].start = U8500_DMA_BASE_ED;
215 dma40_resources[0].end = U8500_DMA_BASE_ED + SZ_4K - 1; 215 dma40_resources[0].end = U8500_DMA_BASE_ED + SZ_4K - 1;
216 dma40_resources[1].start = U8500_DMA_LCPA_BASE_ED;
217 dma40_resources[1].end = U8500_DMA_LCPA_BASE_ED + 2 * SZ_1K - 1;
216} 218}
diff --git a/arch/arm/mach-ux500/include/mach/db8500-regs.h b/arch/arm/mach-ux500/include/mach/db8500-regs.h
index 897fa35078ef..f000218210c9 100644
--- a/arch/arm/mach-ux500/include/mach/db8500-regs.h
+++ b/arch/arm/mach-ux500/include/mach/db8500-regs.h
@@ -17,6 +17,7 @@
17#define U8500_ESRAM_BANK4 (U8500_ESRAM_BANK3 + U8500_ESRAM_BANK_SIZE) 17#define U8500_ESRAM_BANK4 (U8500_ESRAM_BANK3 + U8500_ESRAM_BANK_SIZE)
18/* Use bank 4 for DMA LCPA */ 18/* Use bank 4 for DMA LCPA */
19#define U8500_DMA_LCPA_BASE U8500_ESRAM_BANK4 19#define U8500_DMA_LCPA_BASE U8500_ESRAM_BANK4
20#define U8500_DMA_LCPA_BASE_ED (U8500_ESRAM_BANK4 + 0x4000)
20 21
21#define U8500_PER3_BASE 0x80000000 22#define U8500_PER3_BASE 0x80000000
22#define U8500_STM_BASE 0x80100000 23#define U8500_STM_BASE 0x80100000