Merge branches 'irq-core-for-linus' and 'core-locking-for-linus' of git://git.kernel...

[karo-tx-linux.git] / arch / arm / mach-s5pc100 / include / mach / map.h

diff --git a/arch/arm/mach-s5pc100/include/mach/map.h b/arch/arm/mach-s5pc100/include/mach/map.h
index 01b9134feff0d055fd33418f7b07bc68c000b885..32e9cab5c8645b0481f092dc3c77eeb2109ceb2e 100644 (file)
--- 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)
@@ -113,6 +110,8 @@
 #define S5PC100_PA_PCM0                0xF2400000
 #define S5PC100_PA_PCM1                0xF2500000
 
+#define S5PC100_PA_SPDIF       0xF2600000
+
 #define S5PC100_PA_TSADC       (0xF3000000)
 
 /* KEYPAD */