ARM: S5PC100: Fixup merge problems

[net-next-2.6.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 a0b2fee332a12e31e2a6a94b945dda85856fb0f8..cadae4305688e83e3328383d8701fd6ee0e467d3 100644 (file)
--- a/arch/arm/mach-s5pc100/include/mach/map.h
+++ b/arch/arm/mach-s5pc100/include/mach/map.h
@@ -44,9 +44,7 @@
 #define S5PC100_PA_OTHERS      (0xE0200000)
 #define S5PC100_VA_OTHERS      (S3C_VA_SYS + 0x10000)
 
-#define S5PC100_PA_GPIO                (0xE0300000)
-
-#define S5PC1XX_PA_GPIO                S5PC100_PA_GPIO
+#define S5P_PA_GPIO            (0xE0300000)
 #define S5PC1XX_VA_GPIO                S3C_ADDR(0x00500000)
 
 /* Interrupt */
@@ -56,6 +54,10 @@
 #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)
 
@@ -92,6 +94,10 @@
 
 #define S5PC100_PA_FB          (0xEE000000)
 
+#define S5PC100_PA_I2S0                (0xF2000000)
+#define S5PC100_PA_I2S1                (0xF2100000)
+#define S5PC100_PA_I2S2                (0xF2200000)
+
 #define S5PC100_PA_AC97                0xF2300000
 
 /* PCM */
@@ -115,16 +121,14 @@
 #define S3C_PA_G3D             S5PC100_PA_G3D
 #define S3C_PA_JPEG            S5PC100_PA_JPEG
 #define S3C_PA_ROTATOR         S5PC100_PA_ROTATOR
-#define S3C_VA_VIC0            (S3C_VA_IRQ + 0x0)
-#define S3C_VA_VIC1            (S3C_VA_IRQ + 0x10000)
-#define S3C_VA_VIC2            (S3C_VA_IRQ + 0x20000)
-#define S3C_PA_IIC             S5PC100_PA_I2C
-#define S3C_PA_IIC1            S5PC100_PA_I2C1
+#define S5P_VA_VIC0            S5PC1XX_VA_VIC(0)
+#define S5P_VA_VIC1            S5PC1XX_VA_VIC(1)
+#define S5P_VA_VIC2            S5PC1XX_VA_VIC(2)
 #define S3C_PA_USB_HSOTG       S5PC100_PA_USB_HSOTG
 #define S3C_PA_USB_HSPHY       S5PC100_PA_USB_HSPHY
-#define S3C_PA_HSMMC0          S5PC100_PA_HSMMC0
-#define S3C_PA_HSMMC1          S5PC100_PA_HSMMC1
-#define S3C_PA_HSMMC2          S5PC100_PA_HSMMC2
+#define S3C_PA_HSMMC0          S5PC100_PA_HSMMC(0)
+#define S3C_PA_HSMMC1          S5PC100_PA_HSMMC(1)
+#define S3C_PA_HSMMC2          S5PC100_PA_HSMMC(2)
 #define S3C_PA_KEYPAD          S5PC100_PA_KEYPAD
 #define S3C_PA_TSADC           S5PC100_PA_TSADC
 #define S3C_PA_ONENAND         S5PC100_PA_ONENAND