ARM: imx: reorganize imx-i2c device registration to use a struct per SoC

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

3 files changed, 78 insertions, 11 deletions

diff --git a/arch/arm/plat-mxc/devices/platform-imx-i2c.c b/arch/arm/plat-mxc/devices/platform-imx-i2c.c
index d0af9f7d8ae..ab9670b96c8 100644
--- a/arch/arm/plat-mxc/devices/platform-imx-i2c.c
+++ b/arch/arm/plat-mxc/devices/platform-imx-i2c.c
@@ -6,24 +6,85 @@
  * the terms of the GNU General Public License version 2 as published by the
  * Free Software Foundation.
  */
+#include <mach/hardware.h>
 #include <mach/devices-common.h>
 
-struct platform_device *__init imx_add_imx_i2c(int id,
-                resource_size_t iobase, resource_size_t iosize, int irq,
+#define imx_imx_i2c_data_entry_single(soc, _id, _hwid, _size)           \
+        {                                                               \
+                .id = _id,                                              \
+                .iobase = soc ## _I2C ## _hwid ## _BASE_ADDR,           \
+                .iosize = _size,                                        \
+                .irq = soc ## _INT_I2C ## _hwid,                        \
+        }
+
+#define imx_imx_i2c_data_entry(soc, _id, _hwid, _size)                  \
+        [_id] = imx_imx_i2c_data_entry_single(soc, _id, _hwid, _size)
+
+#ifdef CONFIG_SOC_IMX1
+const struct imx_imx_i2c_data imx1_imx_i2c_data __initconst =
+        imx_imx_i2c_data_entry_single(MX1, 0, , SZ_4K);
+#endif /* ifdef CONFIG_SOC_IMX1 */
+
+#ifdef CONFIG_SOC_IMX21
+const struct imx_imx_i2c_data imx21_imx_i2c_data __initconst =
+        imx_imx_i2c_data_entry_single(MX21, 0, , SZ_4K);
+#endif /* ifdef CONFIG_SOC_IMX21 */
+
+#ifdef CONFIG_ARCH_MX25
+const struct imx_imx_i2c_data imx25_imx_i2c_data[] __initconst = {
+#define imx25_imx_i2c_data_entry(_id, _hwid)                            \
+        imx_imx_i2c_data_entry(MX25, _id, _hwid, SZ_16K)
+        imx25_imx_i2c_data_entry(0, 1),
+        imx25_imx_i2c_data_entry(1, 2),
+        imx25_imx_i2c_data_entry(2, 3),
+};
+#endif /* ifdef CONFIG_ARCH_MX25 */
+
+#ifdef CONFIG_SOC_IMX27
+const struct imx_imx_i2c_data imx27_imx_i2c_data[] __initconst = {
+#define imx27_imx_i2c_data_entry(_id, _hwid)                            \
+        imx_imx_i2c_data_entry(MX27, _id, _hwid, SZ_4K)
+        imx27_imx_i2c_data_entry(0, 1),
+        imx27_imx_i2c_data_entry(1, 2),
+};
+#endif /* ifdef CONFIG_SOC_IMX27 */
+
+#ifdef CONFIG_ARCH_MX31
+const struct imx_imx_i2c_data imx31_imx_i2c_data[] __initconst = {
+#define imx31_imx_i2c_data_entry(_id, _hwid)                            \
+        imx_imx_i2c_data_entry(MX31, _id, _hwid, SZ_4K)
+        imx31_imx_i2c_data_entry(0, 1),
+        imx31_imx_i2c_data_entry(1, 2),
+        imx31_imx_i2c_data_entry(2, 3),
+};
+#endif /* ifdef CONFIG_ARCH_MX31 */
+
+#ifdef CONFIG_ARCH_MX35
+const struct imx_imx_i2c_data imx35_imx_i2c_data[] __initconst = {
+#define imx35_imx_i2c_data_entry(_id, _hwid)                            \
+        imx_imx_i2c_data_entry(MX35, _id, _hwid, SZ_4K)
+        imx35_imx_i2c_data_entry(0, 1),
+        imx35_imx_i2c_data_entry(1, 2),
+};
+#endif /* ifdef CONFIG_ARCH_MX35 */
+
+struct platform_device *__init imx_add_imx_i2c(
+                const struct imx_imx_i2c_data *data,
                 const struct imxi2c_platform_data *pdata)
 {
         struct resource res[] = {
                 {
-                        .start = iobase,
-                        .end = iobase + iosize - 1,
+                        .start = data->iobase,
+                        .end = data->iobase + data->iosize - 1,
                         .flags = IORESOURCE_MEM,
                 }, {
-                        .start = irq,
-                        .end = irq,
+                        .start = data->irq,
+                        .end = data->irq,
                         .flags = IORESOURCE_IRQ,
                 },
         };
 
-        return imx_add_platform_device("imx-i2c", id, res, ARRAY_SIZE(res),
+        return imx_add_platform_device("imx-i2c", data->id,
+                        res, ARRAY_SIZE(res),
                         pdata, sizeof(*pdata));
 }
diff --git a/arch/arm/plat-mxc/include/mach/devices-common.h b/arch/arm/plat-mxc/include/mach/devices-common.h
index 84bfe44ec2c..490fe7c3ed5 100644
--- a/arch/arm/plat-mxc/include/mach/devices-common.h
+++ b/arch/arm/plat-mxc/include/mach/devices-common.h
@@ -21,8 +21,14 @@ struct platform_device *__init imx_add_flexcan(int id,
                 const struct flexcan_platform_data *pdata);
 
 #include <mach/i2c.h>
-struct platform_device *__init imx_add_imx_i2c(int id,
-                resource_size_t iobase, resource_size_t iosize, int irq,
+struct imx_imx_i2c_data {
+        int id;
+        resource_size_t iobase;
+        resource_size_t iosize;
+        resource_size_t irq;
+};
+struct platform_device *__init imx_add_imx_i2c(
+                const struct imx_imx_i2c_data *data,
                 const struct imxi2c_platform_data *pdata);
 
 #include <mach/ssi.h>
diff --git a/arch/arm/plat-mxc/include/mach/mx51.h b/arch/arm/plat-mxc/include/mach/mx51.h
index f6026506c5e..b919235768a 100644
--- a/arch/arm/plat-mxc/include/mach/mx51.h
+++ b/arch/arm/plat-mxc/include/mach/mx51.h
@@ -341,8 +341,8 @@
 #define MX51_MXC_INT_WDOG2              59
 #define MX51_MXC_INT_KPP                60
 #define MX51_MXC_INT_PWM1               61
-#define MX51_MXC_INT_I2C1               62
-#define MX51_MXC_INT_I2C2               63
+#define MX51_INT_I2C1                   62
+#define MX51_INT_I2C2                   63
 #define MX51_MXC_INT_HS_I2C             64
 #define MX51_MXC_INT_RESV65             65
 #define MX51_MXC_INT_RESV66             66