ARM: Merge for-2635-4/watchdog

[net-next-2.6.git] / arch / arm / mach-s5pv210 / include / mach / map.h

diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h
index 1131553c6e78c66387abc4ead56d5aaef9d6221b..3a44e1e5f126b1373ed1d630a6fab63f028859d4 100644 (file)
--- a/arch/arm/mach-s5pv210/include/mach/map.h
+++ b/arch/arm/mach-s5pv210/include/mach/map.h
@@ -25,7 +25,13 @@
 #define S5PV210_PA_GPIO                (0xE0200000)
 #define S5P_PA_GPIO            S5PV210_PA_GPIO
 
+/* SPI */
+#define S5PV210_PA_SPI0                0xE1300000
+#define S5PV210_PA_SPI1                0xE1400000
+
 #define S5PV210_PA_IIC0                (0xE1800000)
+#define S5PV210_PA_IIC1                (0xFAB00000)
+#define S5PV210_PA_IIC2                (0xE1A00000)
 
 #define S5PV210_PA_TIMER       (0xE2500000)
 #define S5P_PA_TIMER           S5PV210_PA_TIMER
@@ -49,6 +55,10 @@
 #define S5PV210_PA_PDMA0       0xE0900000
 #define S5PV210_PA_PDMA1       0xE0A00000
 
+#define S5PV210_PA_FB          (0xF8000000)
+
+#define S5PV210_PA_HSMMC(x)    (0xEB000000 + ((x) * 0x100000))
+
 #define S5PV210_PA_VIC0                (0xF2000000)
 #define S5P_PA_VIC0            S5PV210_PA_VIC0
 
@@ -77,9 +87,19 @@
 /* AC97 */
 #define S5PV210_PA_AC97                0xE2200000
 
+#define S5PV210_PA_ADC         (0xE1700000)
+
 /* compatibiltiy defines. */
 #define S3C_PA_UART            S5PV210_PA_UART
+#define S3C_PA_HSMMC0          S5PV210_PA_HSMMC(0)
+#define S3C_PA_HSMMC1          S5PV210_PA_HSMMC(1)
+#define S3C_PA_HSMMC2          S5PV210_PA_HSMMC(2)
 #define S3C_PA_IIC             S5PV210_PA_IIC0
+#define S3C_PA_IIC1            S5PV210_PA_IIC1
+#define S3C_PA_IIC2            S5PV210_PA_IIC2
+#define S3C_PA_FB              S5PV210_PA_FB
 #define S3C_PA_WDT             S5PV210_PA_WATCHDOG
 
+#define SAMSUNG_PA_ADC         S5PV210_PA_ADC
+
 #endif /* __ASM_ARCH_MAP_H */