diff options
Diffstat (limited to 'arch/arm/mach-prima2/include/mach')
-rw-r--r-- | arch/arm/mach-prima2/include/mach/debug-macro.S | 2 | ||||
-rw-r--r-- | arch/arm/mach-prima2/include/mach/memory.h | 21 |
2 files changed, 1 insertions, 22 deletions
diff --git a/arch/arm/mach-prima2/include/mach/debug-macro.S b/arch/arm/mach-prima2/include/mach/debug-macro.S index bf75106333ff..cd97492bb075 100644 --- a/arch/arm/mach-prima2/include/mach/debug-macro.S +++ b/arch/arm/mach-prima2/include/mach/debug-macro.S | |||
@@ -9,7 +9,7 @@ | |||
9 | #include <mach/hardware.h> | 9 | #include <mach/hardware.h> |
10 | #include <mach/uart.h> | 10 | #include <mach/uart.h> |
11 | 11 | ||
12 | .macro addruart, rp, rv | 12 | .macro addruart, rp, rv, tmp |
13 | ldr \rp, =SIRFSOC_UART1_PA_BASE @ physical | 13 | ldr \rp, =SIRFSOC_UART1_PA_BASE @ physical |
14 | ldr \rv, =SIRFSOC_UART1_VA_BASE @ virtual | 14 | ldr \rv, =SIRFSOC_UART1_VA_BASE @ virtual |
15 | .endm | 15 | .endm |
diff --git a/arch/arm/mach-prima2/include/mach/memory.h b/arch/arm/mach-prima2/include/mach/memory.h deleted file mode 100644 index 368cd5a0601a..000000000000 --- a/arch/arm/mach-prima2/include/mach/memory.h +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-prima2/include/mach/memory.h | ||
3 | * | ||
4 | * Copyright (c) 2010 – 2011 Cambridge Silicon Radio Limited, a CSR plc group company. | ||
5 | * | ||
6 | * Licensed under GPLv2 or later. | ||
7 | */ | ||
8 | |||
9 | #ifndef __ASM_ARCH_MEMORY_H | ||
10 | #define __ASM_ARCH_MEMORY_H | ||
11 | |||
12 | #define PLAT_PHYS_OFFSET UL(0x00000000) | ||
13 | |||
14 | /* | ||
15 | * Restrict DMA-able region to workaround silicon limitation. | ||
16 | * The limitation restricts buffers available for DMA to SD/MMC | ||
17 | * hardware to be below 256MB | ||
18 | */ | ||
19 | #define ARM_DMA_ZONE_SIZE (SZ_256M) | ||
20 | |||
21 | #endif | ||