summaryrefslogtreecommitdiff
path: root/arch/arm/mach-s5p6440/include
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2010-08-31 16:30:51 +0900
committerKukjin Kim <kgene.kim@samsung.com>2010-10-18 10:33:34 +0900
commit19a2c06548db1fa69c40be5bf3ad2095d6119871 (patch)
treec08194d0121bc5dae632aeba254ef641e46015c3 /arch/arm/mach-s5p6440/include
parent13904fba37aa00867dee0b4fe13df92fed1120f9 (diff)
ARM: S5P: Moves initial map for merging S5P64X0
This patch moves some initial maps from plat-s5p to machine, so that can merge mach-s5p6440 and mach-s5p6450. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s5p6440/include')
-rw-r--r--arch/arm/mach-s5p6440/include/mach/map.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-s5p6440/include/mach/map.h b/arch/arm/mach-s5p6440/include/mach/map.h
index 6cc5cbc88ffb..11d31fe87ccf 100644
--- a/arch/arm/mach-s5p6440/include/mach/map.h
+++ b/arch/arm/mach-s5p6440/include/mach/map.h
@@ -24,23 +24,18 @@
#define S5P_PA_SYSCON S5P6440_PA_SYSCON
#define S5P6440_PA_GPIO (0xE0308000)
-#define S5P_PA_GPIO S5P6440_PA_GPIO
#define S5P6440_PA_VIC0 (0xE4000000)
-#define S5P_PA_VIC0 S5P6440_PA_VIC0
+#define S5P6440_PA_VIC1 (0xE4100000)
#define S5P6440_PA_PDMA 0xE9000000
-#define S5P6440_PA_VIC1 (0xE4100000)
-#define S5P_PA_VIC1 S5P6440_PA_VIC1
-
#define S5P6440_PA_TIMER (0xEA000000)
#define S5P_PA_TIMER S5P6440_PA_TIMER
#define S5P6440_PA_RTC (0xEA100000)
#define S5P6440_PA_WDT (0xEA200000)
-#define S5P_PA_WDT S5P6440_PA_WDT
#define S5P6440_PA_UART (0xEC000000)