powerpc/i2c: Convert i2c-mpc into an of_platform driver

Convert i2c-mpc to an of_platform driver. Utilize the code in
drivers/of-i2c.c to make i2c modules dynamically loadable by the
device tree.

Signed-off-by: Jon Smirl <jonsmirl@gmail.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

1 files changed, 0 insertions, 133 deletions

diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index ca54563d5c7e..ebcec7362f95 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -414,139 +414,6 @@ err:
 
 arch_initcall(gfar_of_init);
 
-#ifdef CONFIG_I2C_BOARDINFO
-#include <linux/i2c.h>
-struct i2c_driver_device {
-        char    *of_device;
-        char    *i2c_type;
-};
-
-static struct i2c_driver_device i2c_devices[] __initdata = {
-        {"ricoh,rs5c372a", "rs5c372a"},
-        {"ricoh,rs5c372b", "rs5c372b"},
-        {"ricoh,rv5c386",  "rv5c386"},
-        {"ricoh,rv5c387a", "rv5c387a"},
-        {"dallas,ds1307",  "ds1307"},
-        {"dallas,ds1337",  "ds1337"},
-        {"dallas,ds1338",  "ds1338"},
-        {"dallas,ds1339",  "ds1339"},
-        {"dallas,ds1340",  "ds1340"},
-        {"stm,m41t00",     "m41t00"},
-        {"dallas,ds1374",  "ds1374"},
-        {"cirrus,cs4270",  "cs4270"},
-};
-
-static int __init of_find_i2c_driver(struct device_node *node,
-                                     struct i2c_board_info *info)
-{
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(i2c_devices); i++) {
-                if (!of_device_is_compatible(node, i2c_devices[i].of_device))
-                        continue;
-                if (strlcpy(info->type, i2c_devices[i].i2c_type,
-                            I2C_NAME_SIZE) >= I2C_NAME_SIZE)
-                        return -ENOMEM;
-                return 0;
-        }
-
-        pr_warning("fsl_soc.c: unrecognized i2c node %s\n",
-                (const char *) of_get_property(node, "compatible", NULL));
-
-        return -ENODEV;
-}
-
-static void __init of_register_i2c_devices(struct device_node *adap_node,
-                                           int bus_num)
-{
-        struct device_node *node = NULL;
-
-        while ((node = of_get_next_child(adap_node, node))) {
-                struct i2c_board_info info = {};
-                const u32 *addr;
-                int len;
-
-                addr = of_get_property(node, "reg", &len);
-                if (!addr || len < sizeof(int) || *addr > (1 << 10) - 1) {
-                        printk(KERN_WARNING "fsl_soc.c: invalid i2c device entry\n");
-                        continue;
-                }
-
-                info.irq = irq_of_parse_and_map(node, 0);
-                if (info.irq == NO_IRQ)
-                        info.irq = -1;
-
-                if (of_find_i2c_driver(node, &info) < 0)
-                        continue;
-
-                info.addr = *addr;
-
-                i2c_register_board_info(bus_num, &info, 1);
-        }
-}
-
-static int __init fsl_i2c_of_init(void)
-{
-        struct device_node *np;
-        unsigned int i = 0;
-        struct platform_device *i2c_dev;
-        int ret;
-
-        for_each_compatible_node(np, NULL, "fsl-i2c") {
-                struct resource r[2];
-                struct fsl_i2c_platform_data i2c_data;
-                const unsigned char *flags = NULL;
-                int idx;
-                const u32 *iprop;
-
-                memset(&r, 0, sizeof(r));
-                memset(&i2c_data, 0, sizeof(i2c_data));
-
-                ret = of_address_to_resource(np, 0, &r[0]);
-                if (ret)
-                        goto err;
-
-                of_irq_to_resource(np, 0, &r[1]);
-
-                iprop = of_get_property(np, "cell-index", NULL);
-                idx = iprop ? *iprop : i;
-
-                i2c_dev = platform_device_register_simple("fsl-i2c", idx, r, 2);
-                if (IS_ERR(i2c_dev)) {
-                        ret = PTR_ERR(i2c_dev);
-                        goto err;
-                }
-
-                i2c_data.device_flags = 0;
-                flags = of_get_property(np, "dfsrr", NULL);
-                if (flags)
-                        i2c_data.device_flags |= FSL_I2C_DEV_SEPARATE_DFSRR;
-
-                flags = of_get_property(np, "fsl5200-clocking", NULL);
-                if (flags)
-                        i2c_data.device_flags |= FSL_I2C_DEV_CLOCK_5200;
-
-                ret =
-                    platform_device_add_data(i2c_dev, &i2c_data,
-                                             sizeof(struct
-                                                    fsl_i2c_platform_data));
-                if (ret)
-                        goto unreg;
-
-                of_register_i2c_devices(np, idx);
-                i++;
-        }
-
-        return 0;
-
-unreg:
-        platform_device_unregister(i2c_dev);
-err:
-        return ret;
-}
-
-arch_initcall(fsl_i2c_of_init);
-#endif
 
 #ifdef CONFIG_PPC_83xx
 static int __init mpc83xx_wdt_init(void)