summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pc100/include/mach/map.h
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-s5pc100/include/mach/map.h
parent13904fba37aa00867dee0b4fe13df92fed1120f9 (diff)
downloadop-kernel-dev-19a2c06548db1fa69c40be5bf3ad2095d6119871.zip
op-kernel-dev-19a2c06548db1fa69c40be5bf3ad2095d6119871.tar.gz
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-s5pc100/include/mach/map.h')
-rw-r--r--arch/arm/mach-s5pc100/include/mach/map.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/arm/mach-s5pc100/include/mach/map.h b/arch/arm/mach-s5pc100/include/mach/map.h
index 01b9134..8751ef4 100644
--- a/arch/arm/mach-s5pc100/include/mach/map.h
+++ b/arch/arm/mach-s5pc100/include/mach/map.h
@@ -44,19 +44,16 @@
#define S5PC100_PA_OTHERS (0xE0200000)
#define S5PC100_VA_OTHERS (S3C_VA_SYS + 0x10000)
-#define S5P_PA_GPIO (0xE0300000)
+#define S5PC100_PA_GPIO (0xE0300000)
#define S5PC1XX_VA_GPIO S3C_ADDR(0x00500000)
/* Interrupt */
-#define S5PC100_PA_VIC (0xE4000000)
+#define S5PC100_PA_VIC0 (0xE4000000)
+#define S5PC100_PA_VIC1 (0xE4100000)
+#define S5PC100_PA_VIC2 (0xE4200000)
#define S5PC100_VA_VIC S3C_VA_IRQ
-#define S5PC100_PA_VIC_OFFSET 0x100000
#define S5PC100_VA_VIC_OFFSET 0x10000
-#define S5PC1XX_PA_VIC(x) (S5PC100_PA_VIC + ((x) * S5PC100_PA_VIC_OFFSET))
#define S5PC1XX_VA_VIC(x) (S5PC100_VA_VIC + ((x) * S5PC100_VA_VIC_OFFSET))
-#define S5P_PA_VIC0 S5PC1XX_PA_VIC(0)
-#define S5P_PA_VIC1 S5PC1XX_PA_VIC(1)
-#define S5P_PA_VIC2 S5PC1XX_PA_VIC(2)
#define S5PC100_PA_ONENAND (0xE7100000)
OpenPOWER on IntegriCloud