commit 54b89177ac533dc7439491afd26baf59464b425c
author Ben Dooks <ben-linux@fluff.org> Tue Jan 19 18:53:46 2010 +0900
committer Ben Dooks <ben-linux@fluff.org> Tue Jan 19 18:53:46 2010 +0900
tree 1eb307706810bb22d81ecf93b3570946f92605b1
parent a0c814afcfc2c840698372bd402b669b659ee1c5
parent af1519408a0d40f312e8f103504cd292cc49d927

ARM: Merge next-samsung-s5p6440-iodec

Merge branch 'next-samsung-s5p6440-iodec' into next-samsung-try10

arch/arm/mach-s5p6440/include/mach/map.h

diff --git a/arch/arm/mach-s5p6440/include/mach/map.h b/arch/arm/mach-s5p6440/include/mach/map.h
index b370329..dc922d6 100644
--- a/arch/arm/mach-s5p6440/include/mach/map.h
+++ b/arch/arm/mach-s5p6440/include/mach/map.h
@@ -15,6 +15,11 @@
 
 #include <plat/map-base.h>
 
+/* Chip ID */
+#define S5P6440_PA_CHIPID	(0xE0000000)
+#define S5P_PA_CHIPID		S5P6440_PA_CHIPID
+#define S5P_VA_CHIPID		S3C_ADDR(0x00700000)
+
 /* SYSCON */
 #define S5P6440_PA_SYSCON	(0xE0100000)
 #define S5P_PA_SYSCON		S5P6440_PA_SYSCON