1 files changed, 72 insertions, 26 deletions

diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c
index f044b5927508..eec2b4993c69 100644
--- a/arch/arm/plat-omap/i2c.c
+++ b/arch/arm/plat-omap/i2c.c
@@ -38,6 +38,7 @@
 #define OMAP2_I2C_BASE1         0x48070000
 #define OMAP2_I2C_BASE2         0x48072000
 #define OMAP2_I2C_BASE3         0x48060000
+#define OMAP4_I2C_BASE4         0x48350000
 
 static const char name[] = "i2c_omap";
 
@@ -54,11 +55,14 @@ static const char name[] = "i2c_omap";
 
 static struct resource i2c_resources[][2] = {
         { I2C_RESOURCE_BUILDER(0, 0) },
-#if     defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
-        { I2C_RESOURCE_BUILDER(OMAP2_I2C_BASE2, INT_24XX_I2C2_IRQ) },
+#if     defined(CONFIG_ARCH_OMAP2PLUS)
+        { I2C_RESOURCE_BUILDER(OMAP2_I2C_BASE2, 0) },
 #endif
-#if     defined(CONFIG_ARCH_OMAP3)
-        { I2C_RESOURCE_BUILDER(OMAP2_I2C_BASE3, INT_34XX_I2C3_IRQ) },
+#if     defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
+        { I2C_RESOURCE_BUILDER(OMAP2_I2C_BASE3, 0) },
+#endif
+#if     defined(CONFIG_ARCH_OMAP4)
+        { I2C_RESOURCE_BUILDER(OMAP4_I2C_BASE4, 0) },
 #endif
 };
 
@@ -76,12 +80,15 @@ static struct resource i2c_resources[][2] = {
 static struct omap_i2c_bus_platform_data i2c_pdata[ARRAY_SIZE(i2c_resources)];
 static struct platform_device omap_i2c_devices[] = {
         I2C_DEV_BUILDER(1, i2c_resources[0], &i2c_pdata[0]),
-#if     defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
+#if     defined(CONFIG_ARCH_OMAP2PLUS)
         I2C_DEV_BUILDER(2, i2c_resources[1], &i2c_pdata[1]),
 #endif
-#if     defined(CONFIG_ARCH_OMAP3)
+#if     defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
         I2C_DEV_BUILDER(3, i2c_resources[2], &i2c_pdata[2]),
 #endif
+#if     defined(CONFIG_ARCH_OMAP4)
+        I2C_DEV_BUILDER(4, i2c_resources[3], &i2c_pdata[3]),
+#endif
 };
 
 #define OMAP_I2C_CMDLINE_SETUP  (BIT(31))
@@ -96,37 +103,60 @@ static int __init omap_i2c_nr_ports(void)
                 ports = 2;
         else if (cpu_is_omap34xx())
                 ports = 3;
+        else if (cpu_is_omap44xx())
+                ports = 4;
 
         return ports;
 }
 
-static int __init omap_i2c_add_bus(int bus_id)
+/* Shared between omap2 and 3 */
+static resource_size_t omap2_i2c_irq[3] __initdata = {
+        INT_24XX_I2C1_IRQ,
+        INT_24XX_I2C2_IRQ,
+        INT_34XX_I2C3_IRQ,
+};
+
+static resource_size_t omap4_i2c_irq[4] __initdata = {
+        OMAP44XX_IRQ_I2C1,
+        OMAP44XX_IRQ_I2C2,
+        OMAP44XX_IRQ_I2C3,
+        OMAP44XX_IRQ_I2C4,
+};
+
+static inline int omap1_i2c_add_bus(struct platform_device *pdev, int bus_id)
 {
-        struct platform_device *pdev;
         struct omap_i2c_bus_platform_data *pd;
         struct resource *res;
-        resource_size_t base, irq;
 
-        pdev = &omap_i2c_devices[bus_id - 1];
         pd = pdev->dev.platform_data;
+        res = pdev->resource;
+        res[0].start = OMAP1_I2C_BASE;
+        res[0].end = res[0].start + OMAP_I2C_SIZE;
+        res[1].start = INT_I2C;
+        omap1_i2c_mux_pins(bus_id);
+
+        return platform_device_register(pdev);
+}
+
+static inline int omap2_i2c_add_bus(struct platform_device *pdev, int bus_id)
+{
+        struct resource *res;
+        resource_size_t *irq;
+
+        res = pdev->resource;
+
+        if (!cpu_is_omap44xx())
+                irq = omap2_i2c_irq;
+        else
+                irq = omap4_i2c_irq;
+
         if (bus_id == 1) {
-                res = pdev->resource;
-                if (cpu_class_is_omap1()) {
-                        base = OMAP1_I2C_BASE;
-                        irq = INT_I2C;
-                } else {
-                        base = OMAP2_I2C_BASE1;
-                        irq = INT_24XX_I2C1_IRQ;
-                }
-                res[0].start = base;
-                res[0].end = base + OMAP_I2C_SIZE;
-                res[1].start = irq;
+                res[0].start = OMAP2_I2C_BASE1;
+                res[0].end = res[0].start + OMAP_I2C_SIZE;
         }
 
-        if (cpu_class_is_omap1())
-                omap1_i2c_mux_pins(bus_id);
-        if (cpu_class_is_omap2())
-                omap2_i2c_mux_pins(bus_id);
+        res[1].start = irq[bus_id - 1];
+        omap2_i2c_mux_pins(bus_id);
 
         /*
          * When waiting for completion of a i2c transfer, we need to
@@ -134,12 +164,28 @@ static int __init omap_i2c_add_bus(int bus_id)
          * ensure quick enough wakeup from idle, when transfer
          * completes.
          */
-        if (cpu_is_omap34xx())
+        if (cpu_is_omap34xx()) {
+                struct omap_i2c_bus_platform_data *pd;
+
+                pd = pdev->dev.platform_data;
                 pd->set_mpu_wkup_lat = omap_pm_set_max_mpu_wakeup_lat;
+        }
 
         return platform_device_register(pdev);
 }
 
+static int __init omap_i2c_add_bus(int bus_id)
+{
+        struct platform_device *pdev;
+
+        pdev = &omap_i2c_devices[bus_id - 1];
+
+        if (cpu_class_is_omap1())
+                return omap1_i2c_add_bus(pdev, bus_id);
+        else
+                return omap2_i2c_add_bus(pdev, bus_id);
+}
+
 /**
  * omap_i2c_bus_setup - Process command line options for the I2C bus speed
  * @str: String of options