ARM: S5PV310: Define address & interrupt for all I2C blocks

S5PV310 and S5PC210 support total 8 (+ 1 dedicated for HDMI) I2C devices.

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

diff --git a/arch/arm/mach-s5pv310/include/mach/irqs.h b/arch/arm/mach-s5pv310/include/mach/irqs.h
index e81332f0330fce82769e78723ef03c195d8da4d6..b2acc6215667a30b4a84b7b10eba18f17c083a15 100644 (file)
--- a/arch/arm/mach-s5pv310/include/mach/irqs.h
+++ b/arch/arm/mach-s5pv310/include/mach/irqs.h
@@ -70,6 +70,13 @@
 #define IRQ_UART4              COMBINER_IRQ(26, 4)
 
 #define IRQ_IIC                        COMBINER_IRQ(27, 0)
+#define IRQ_IIC1               COMBINER_IRQ(27, 1)
+#define IRQ_IIC2               COMBINER_IRQ(27, 2)
+#define IRQ_IIC3               COMBINER_IRQ(27, 3)
+#define IRQ_IIC4               COMBINER_IRQ(27, 4)
+#define IRQ_IIC5               COMBINER_IRQ(27, 5)
+#define IRQ_IIC6               COMBINER_IRQ(27, 6)
+#define IRQ_IIC7               COMBINER_IRQ(27, 7)
 
 #define IRQ_HSMMC0             COMBINER_IRQ(29, 0)
 #define IRQ_HSMMC1             COMBINER_IRQ(29, 1)

diff --git a/arch/arm/mach-s5pv310/include/mach/map.h b/arch/arm/mach-s5pv310/include/mach/map.h
index 8014c3a6dd5dc88c798ebe6a95dd429b6d3f9fb0..1e3384fba13a5120402c7135d5a4960e83f22387 100644 (file)
--- a/arch/arm/mach-s5pv310/include/mach/map.h
+++ b/arch/arm/mach-s5pv310/include/mach/map.h
@@ -67,7 +67,7 @@
 
 #define S5P_SZ_UART                    SZ_256
 
-#define S5PV310_PA_IIC0                        (0x13860000)
+#define S5PV310_PA_IIC(x)              (0x13860000 + ((x) * 0x10000))
 
 #define S5PV310_PA_TIMER               (0x139D0000)
 #define S5P_PA_TIMER                   S5PV310_PA_TIMER
@@ -81,7 +81,14 @@
 #define S3C_PA_HSMMC1                  S5PV310_PA_HSMMC(1)
 #define S3C_PA_HSMMC2                  S5PV310_PA_HSMMC(2)
 #define S3C_PA_HSMMC3                  S5PV310_PA_HSMMC(3)
-#define S3C_PA_IIC                     S5PV310_PA_IIC0
+#define S3C_PA_IIC                     S5PV310_PA_IIC(0)
+#define S3C_PA_IIC1                    S5PV310_PA_IIC(1)
+#define S3C_PA_IIC2                    S5PV310_PA_IIC(2)
+#define S3C_PA_IIC3                    S5PV310_PA_IIC(3)
+#define S3C_PA_IIC4                    S5PV310_PA_IIC(4)
+#define S3C_PA_IIC5                    S5PV310_PA_IIC(5)
+#define S3C_PA_IIC6                    S5PV310_PA_IIC(6)
+#define S3C_PA_IIC7                    S5PV310_PA_IIC(7)
 #define S3C_PA_RTC                     S5PV310_PA_RTC
 #define S3C_PA_WDT                     S5PV310_PA_WATCHDOG