i2c-pnx.c: Use resources in platforms

As a precondition for device tree conversion, the platforms using i2c-pnx.c are
converted to using mem and irq resources instead of platform data.

Signed-off-by: Roland Stigge <stigge@antcom.de>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>

2 files changed, 81 insertions, 50 deletions

diff --git a/arch/arm/mach-lpc32xx/common.c b/arch/arm/mach-lpc32xx/common.c
index bbbf063a74c2..6f255600fc97 100644
--- a/arch/arm/mach-lpc32xx/common.c
+++ b/arch/arm/mach-lpc32xx/common.c
@@ -27,7 +27,6 @@
 
 #include <asm/mach/map.h>
 
-#include <mach/i2c.h>
 #include <mach/hardware.h>
 #include <mach/platform.h>
 #include "common.h"
@@ -53,46 +52,64 @@ struct platform_device lpc32xx_watchdog_device = {
 /*
  * I2C busses
  */
-static struct i2c_pnx_data i2c0_data = {
-        .name = I2C_CHIP_NAME "1",
-        .base = LPC32XX_I2C1_BASE,
-        .irq = IRQ_LPC32XX_I2C_1,
+static struct resource i2c0_resources[] = {
+        [0] = {
+                .start = LPC32XX_I2C1_BASE,
+                .end = LPC32XX_I2C1_BASE + 0x100 - 1,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = IRQ_LPC32XX_I2C_1,
+                .end = IRQ_LPC32XX_I2C_1,
+                .flags = IORESOURCE_IRQ,
+        },
 };
 
-static struct i2c_pnx_data i2c1_data = {
-        .name = I2C_CHIP_NAME "2",
-        .base = LPC32XX_I2C2_BASE,
-        .irq = IRQ_LPC32XX_I2C_2,
+static struct resource i2c1_resources[] = {
+        [0] = {
+                .start = LPC32XX_I2C2_BASE,
+                .end = LPC32XX_I2C2_BASE + 0x100 - 1,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = IRQ_LPC32XX_I2C_2,
+                .end = IRQ_LPC32XX_I2C_2,
+                .flags = IORESOURCE_IRQ,
+        },
 };
 
-static struct i2c_pnx_data i2c2_data = {
-        .name = "USB-I2C",
-        .base = LPC32XX_OTG_I2C_BASE,
-        .irq = IRQ_LPC32XX_USB_I2C,
+static struct resource i2c2_resources[] = {
+        [0] = {
+                .start = LPC32XX_OTG_I2C_BASE,
+                .end = LPC32XX_OTG_I2C_BASE + 0x100 - 1,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = IRQ_LPC32XX_USB_I2C,
+                .end = IRQ_LPC32XX_USB_I2C,
+                .flags = IORESOURCE_IRQ,
+        },
 };
 
 struct platform_device lpc32xx_i2c0_device = {
-        .name = "pnx-i2c",
+        .name = "pnx-i2c.0",
         .id = 0,
-        .dev = {
-                .platform_data = &i2c0_data,
-        },
+        .num_resources = ARRAY_SIZE(i2c0_resources),
+        .resource = i2c0_resources,
 };
 
 struct platform_device lpc32xx_i2c1_device = {
-        .name = "pnx-i2c",
+        .name = "pnx-i2c.1",
         .id = 1,
-        .dev = {
-                .platform_data = &i2c1_data,
-        },
+        .num_resources = ARRAY_SIZE(i2c1_resources),
+        .resource = i2c1_resources,
 };
 
 struct platform_device lpc32xx_i2c2_device = {
-        .name = "pnx-i2c",
+        .name = "pnx-i2c.2",
         .id = 2,
-        .dev = {
-                .platform_data = &i2c2_data,
-        },
+        .num_resources = ARRAY_SIZE(i2c2_resources),
+        .resource = i2c2_resources,
 };
 
 /* TSC (Touch Screen Controller) */
diff --git a/arch/arm/mach-pnx4008/i2c.c b/arch/arm/mach-pnx4008/i2c.c
index 8103f9644e2d..550cfc2a1f2e 100644
--- a/arch/arm/mach-pnx4008/i2c.c
+++ b/arch/arm/mach-pnx4008/i2c.c
@@ -16,48 +16,62 @@
 #include <linux/err.h>
 #include <mach/platform.h>
 #include <mach/irqs.h>
-#include <mach/i2c.h>
 
-static struct i2c_pnx_data i2c0_data = {
-        .name = I2C_CHIP_NAME "0",
-        .base = PNX4008_I2C1_BASE,
-        .irq = I2C_1_INT,
+static struct resource i2c0_resources[] = {
+        {
+                .start = PNX4008_I2C1_BASE,
+                .end = PNX4008_I2C1_BASE + SZ_4K - 1,
+                .flags = IORESOURCE_MEM,
+        }, {
+                .start = I2C_1_INT,
+                .end = I2C_1_INT,
+                .flags = IORESOURCE_IRQ,
+        },
 };
 
-static struct i2c_pnx_data i2c1_data = {
-        .name = I2C_CHIP_NAME "1",
-        .base = PNX4008_I2C2_BASE,
-        .irq = I2C_2_INT,
+static struct resource i2c1_resources[] = {
+        {
+                .start = PNX4008_I2C2_BASE,
+                .end = PNX4008_I2C2_BASE + SZ_4K - 1,
+                .flags = IORESOURCE_MEM,
+        }, {
+                .start = I2C_2_INT,
+                .end = I2C_2_INT,
+                .flags = IORESOURCE_IRQ,
+        },
 };
 
-static struct i2c_pnx_data i2c2_data = {
-        .name = "USB-I2C",
-        .base = (PNX4008_USB_CONFIG_BASE + 0x300),
-        .irq = USB_I2C_INT,
+static struct resource i2c2_resources[] = {
+        {
+                .start = PNX4008_USB_CONFIG_BASE + 0x300,
+                .end = PNX4008_USB_CONFIG_BASE + 0x300 + SZ_4K - 1,
+                .flags = IORESOURCE_MEM,
+        }, {
+                .start = USB_I2C_INT,
+                .end = USB_I2C_INT,
+                .flags = IORESOURCE_IRQ,
+        },
 };
 
 static struct platform_device i2c0_device = {
-        .name = "pnx-i2c",
+        .name = "pnx-i2c.0",
         .id = 0,
-        .dev = {
-                .platform_data = &i2c0_data,
-        },
+        .resource = i2c0_resources,
+        .num_resources = ARRAY_SIZE(i2c0_resources),
 };
 
 static struct platform_device i2c1_device = {
-        .name = "pnx-i2c",
+        .name = "pnx-i2c.1",
         .id = 1,
-        .dev = {
-                .platform_data = &i2c1_data,
-        },
+        .resource = i2c1_resources,
+        .num_resources = ARRAY_SIZE(i2c1_resources),
 };
 
 static struct platform_device i2c2_device = {
-        .name = "pnx-i2c",
+        .name = "pnx-i2c.2",
         .id = 2,
-        .dev = {
-                .platform_data = &i2c2_data,
-        },
+        .resource = i2c2_resources,
+        .num_resources = ARRAY_SIZE(i2c2_resources),
 };
 
 static struct platform_device *devices[] __initdata = {