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 fb5d05e91e4475f5c8cd38cc4b51cf0f14efbe6f..3a44e1e5f126b1373ed1d630a6fab63f028859d4 100644 (file)
--- a/arch/arm/mach-s5pv210/include/mach/map.h
+++ b/arch/arm/mach-s5pv210/include/mach/map.h
@@ -25,6 +25,10 @@
 #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)
@@ -34,6 +38,8 @@
 
 #define S5PV210_PA_SYSTIMER    (0xE2600000)
 
+#define S5PV210_PA_WATCHDOG    (0xE2700000)
+
 #define S5PV210_PA_UART                (0xE2900000)
 
 #define S5P_PA_UART0           (S5PV210_PA_UART + 0x0)
@@ -92,6 +98,7 @@
 #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