3 files changed, 151 insertions, 43 deletions

diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c
index 69fbfaedc039..c0330a41db03 100644
--- a/drivers/i2c/busses/i2c-gpio.c
+++ b/drivers/i2c/busses/i2c-gpio.c
@@ -15,6 +15,14 @@
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
+#include <linux/of_gpio.h>
+#include <linux/of_i2c.h>
+
+struct i2c_gpio_private_data {
+        struct i2c_adapter adap;
+        struct i2c_algo_bit_data bit_data;
+        struct i2c_gpio_platform_data pdata;
+};
 
 /* Toggle SDA by changing the direction of the pin */
 static void i2c_gpio_setsda_dir(void *data, int state)
@@ -77,24 +85,62 @@ static int i2c_gpio_getscl(void *data)
         return gpio_get_value(pdata->scl_pin);
 }
 
+static int __devinit of_i2c_gpio_probe(struct device_node *np,
+                             struct i2c_gpio_platform_data *pdata)
+{
+        u32 reg;
+
+        if (of_gpio_count(np) < 2)
+                return -ENODEV;
+
+        pdata->sda_pin = of_get_gpio(np, 0);
+        pdata->scl_pin = of_get_gpio(np, 1);
+
+        if (!gpio_is_valid(pdata->sda_pin) || !gpio_is_valid(pdata->scl_pin)) {
+                pr_err("%s: invalid GPIO pins, sda=%d/scl=%d\n",
+                       np->full_name, pdata->sda_pin, pdata->scl_pin);
+                return -ENODEV;
+        }
+
+        of_property_read_u32(np, "i2c-gpio,delay-us", &pdata->udelay);
+
+        if (!of_property_read_u32(np, "i2c-gpio,timeout-ms", &reg))
+                pdata->timeout = msecs_to_jiffies(reg);
+
+        pdata->sda_is_open_drain =
+                of_property_read_bool(np, "i2c-gpio,sda-open-drain");
+        pdata->scl_is_open_drain =
+                of_property_read_bool(np, "i2c-gpio,scl-open-drain");
+        pdata->scl_is_output_only =
+                of_property_read_bool(np, "i2c-gpio,scl-output-only");
+
+        return 0;
+}
+
 static int __devinit i2c_gpio_probe(struct platform_device *pdev)
 {
+        struct i2c_gpio_private_data *priv;
         struct i2c_gpio_platform_data *pdata;
         struct i2c_algo_bit_data *bit_data;
         struct i2c_adapter *adap;
         int ret;
 
-        pdata = pdev->dev.platform_data;
-        if (!pdata)
-                return -ENXIO;
-
-        ret = -ENOMEM;
-        adap = kzalloc(sizeof(struct i2c_adapter), GFP_KERNEL);
-        if (!adap)
-                goto err_alloc_adap;
-        bit_data = kzalloc(sizeof(struct i2c_algo_bit_data), GFP_KERNEL);
-        if (!bit_data)
-                goto err_alloc_bit_data;
+        priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+        adap = &priv->adap;
+        bit_data = &priv->bit_data;
+        pdata = &priv->pdata;
+
+        if (pdev->dev.of_node) {
+                ret = of_i2c_gpio_probe(pdev->dev.of_node, pdata);
+                if (ret)
+                        return ret;
+        } else {
+                if (!pdev->dev.platform_data)
+                        return -ENXIO;
+                memcpy(pdata, pdev->dev.platform_data, sizeof(*pdata));
+        }
 
         ret = gpio_request(pdata->sda_pin, "sda");
         if (ret)
@@ -142,6 +188,7 @@ static int __devinit i2c_gpio_probe(struct platform_device *pdev)
         adap->algo_data = bit_data;
         adap->class = I2C_CLASS_HWMON | I2C_CLASS_SPD;
         adap->dev.parent = &pdev->dev;
+        adap->dev.of_node = pdev->dev.of_node;
 
         /*
          * If "dev->id" is negative we consider it as zero.
@@ -153,7 +200,9 @@ static int __devinit i2c_gpio_probe(struct platform_device *pdev)
         if (ret)
                 goto err_add_bus;
 
-        platform_set_drvdata(pdev, adap);
+        of_i2c_register_devices(adap);
+
+        platform_set_drvdata(pdev, priv);
 
         dev_info(&pdev->dev, "using pins %u (SDA) and %u (SCL%s)\n",
                  pdata->sda_pin, pdata->scl_pin,
@@ -167,34 +216,40 @@ err_add_bus:
 err_request_scl:
         gpio_free(pdata->sda_pin);
 err_request_sda:
-        kfree(bit_data);
-err_alloc_bit_data:
-        kfree(adap);
-err_alloc_adap:
         return ret;
 }
 
 static int __devexit i2c_gpio_remove(struct platform_device *pdev)
 {
+        struct i2c_gpio_private_data *priv;
         struct i2c_gpio_platform_data *pdata;
         struct i2c_adapter *adap;
 
-        adap = platform_get_drvdata(pdev);
-        pdata = pdev->dev.platform_data;
+        priv = platform_get_drvdata(pdev);
+        adap = &priv->adap;
+        pdata = &priv->pdata;
 
         i2c_del_adapter(adap);
         gpio_free(pdata->scl_pin);
         gpio_free(pdata->sda_pin);
-        kfree(adap->algo_data);
-        kfree(adap);
 
         return 0;
 }
 
+#if defined(CONFIG_OF)
+static const struct of_device_id i2c_gpio_dt_ids[] = {
+        { .compatible = "i2c-gpio", },
+        { /* sentinel */ }
+};
+
+MODULE_DEVICE_TABLE(of, i2c_gpio_dt_ids);
+#endif
+
 static struct platform_driver i2c_gpio_driver = {
         .driver         = {
                 .name   = "i2c-gpio",
                 .owner  = THIS_MODULE,
+                .of_match_table = of_match_ptr(i2c_gpio_dt_ids),
         },
         .probe          = i2c_gpio_probe,
         .remove         = __devexit_p(i2c_gpio_remove),
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index 124d9c594f40..dfb84b7ee550 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -191,7 +191,7 @@ static int i2c_imx_start(struct imx_i2c_struct *i2c_imx)
 
         dev_dbg(&i2c_imx->adapter.dev, "<%s>\n", __func__);
 
-        clk_enable(i2c_imx->clk);
+        clk_prepare_enable(i2c_imx->clk);
         writeb(i2c_imx->ifdr, i2c_imx->base + IMX_I2C_IFDR);
         /* Enable I2C controller */
         writeb(0, i2c_imx->base + IMX_I2C_I2SR);
@@ -240,7 +240,7 @@ static void i2c_imx_stop(struct imx_i2c_struct *i2c_imx)
 
         /* Disable I2C controller */
         writeb(0, i2c_imx->base + IMX_I2C_I2CR);
-        clk_disable(i2c_imx->clk);
+        clk_disable_unprepare(i2c_imx->clk);
 }
 
 static void __init i2c_imx_set_clk(struct imx_i2c_struct *i2c_imx,
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index d60364650990..f6733267fa9c 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -29,6 +29,8 @@
 #include <linux/errno.h>
 #include <linux/interrupt.h>
 #include <linux/i2c-pxa.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
 #include <linux/of_i2c.h>
 #include <linux/platform_device.h>
 #include <linux/err.h>
@@ -1044,23 +1046,60 @@ static const struct i2c_algorithm i2c_pxa_pio_algorithm = {
         .functionality  = i2c_pxa_functionality,
 };
 
-static int i2c_pxa_probe(struct platform_device *dev)
+static struct of_device_id i2c_pxa_dt_ids[] = {
+        { .compatible = "mrvl,pxa-i2c", .data = (void *)REGS_PXA2XX },
+        { .compatible = "mrvl,pwri2c", .data = (void *)REGS_PXA3XX },
+        { .compatible = "mrvl,mmp-twsi", .data = (void *)REGS_PXA2XX },
+        {}
+};
+MODULE_DEVICE_TABLE(of, i2c_pxa_dt_ids);
+
+static int i2c_pxa_probe_dt(struct platform_device *pdev, struct pxa_i2c *i2c,
+                            enum pxa_i2c_types *i2c_types)
 {
-        struct pxa_i2c *i2c;
-        struct resource *res;
-        struct i2c_pxa_platform_data *plat = dev->dev.platform_data;
-        const struct platform_device_id *id = platform_get_device_id(dev);
-        enum pxa_i2c_types i2c_type = id->driver_data;
+        struct device_node *np = pdev->dev.of_node;
+        const struct of_device_id *of_id =
+                        of_match_device(i2c_pxa_dt_ids, &pdev->dev);
         int ret;
-        int irq;
 
-        res = platform_get_resource(dev, IORESOURCE_MEM, 0);
-        irq = platform_get_irq(dev, 0);
-        if (res == NULL || irq < 0)
-                return -ENODEV;
+        if (!of_id)
+                return 1;
+        ret = of_alias_get_id(np, "i2c");
+        if (ret < 0) {
+                dev_err(&pdev->dev, "failed to get alias id, errno %d\n", ret);
+                return ret;
+        }
+        pdev->id = ret;
+        if (of_get_property(np, "mrvl,i2c-polling", NULL))
+                i2c->use_pio = 1;
+        if (of_get_property(np, "mrvl,i2c-fast-mode", NULL))
+                i2c->fast_mode = 1;
+        *i2c_types = (u32)(of_id->data);
+        return 0;
+}
 
-        if (!request_mem_region(res->start, resource_size(res), res->name))
-                return -ENOMEM;
+static int i2c_pxa_probe_pdata(struct platform_device *pdev,
+                               struct pxa_i2c *i2c,
+                               enum pxa_i2c_types *i2c_types)
+{
+        struct i2c_pxa_platform_data *plat = pdev->dev.platform_data;
+        const struct platform_device_id *id = platform_get_device_id(pdev);
+
+        *i2c_types = id->driver_data;
+        if (plat) {
+                i2c->use_pio = plat->use_pio;
+                i2c->fast_mode = plat->fast_mode;
+        }
+        return 0;
+}
+
+static int i2c_pxa_probe(struct platform_device *dev)
+{
+        struct i2c_pxa_platform_data *plat = dev->dev.platform_data;
+        enum pxa_i2c_types i2c_type;
+        struct pxa_i2c *i2c;
+        struct resource *res = NULL;
+        int ret, irq;
 
         i2c = kzalloc(sizeof(struct pxa_i2c), GFP_KERNEL);
         if (!i2c) {
@@ -1068,6 +1107,24 @@ static int i2c_pxa_probe(struct platform_device *dev)
                 goto emalloc;
         }
 
+        ret = i2c_pxa_probe_dt(dev, i2c, &i2c_type);
+        if (ret > 0)
+                ret = i2c_pxa_probe_pdata(dev, i2c, &i2c_type);
+        if (ret < 0)
+                goto eclk;
+
+        res = platform_get_resource(dev, IORESOURCE_MEM, 0);
+        irq = platform_get_irq(dev, 0);
+        if (res == NULL || irq < 0) {
+                ret = -ENODEV;
+                goto eclk;
+        }
+
+        if (!request_mem_region(res->start, resource_size(res), res->name)) {
+                ret = -ENOMEM;
+                goto eclk;
+        }
+
         i2c->adap.owner   = THIS_MODULE;
         i2c->adap.retries = 5;
 
@@ -1109,21 +1166,16 @@ static int i2c_pxa_probe(struct platform_device *dev)
 
         i2c->slave_addr = I2C_PXA_SLAVE_ADDR;
 
-#ifdef CONFIG_I2C_PXA_SLAVE
         if (plat) {
+#ifdef CONFIG_I2C_PXA_SLAVE
                 i2c->slave_addr = plat->slave_addr;
                 i2c->slave = plat->slave;
-        }
 #endif
-
-        clk_enable(i2c->clk);
-
-        if (plat) {
                 i2c->adap.class = plat->class;
-                i2c->use_pio = plat->use_pio;
-                i2c->fast_mode = plat->fast_mode;
         }
 
+        clk_enable(i2c->clk);
+
         if (i2c->use_pio) {
                 i2c->adap.algo = &i2c_pxa_pio_algorithm;
         } else {
@@ -1234,6 +1286,7 @@ static struct platform_driver i2c_pxa_driver = {
                 .name   = "pxa2xx-i2c",
                 .owner  = THIS_MODULE,
                 .pm     = I2C_PXA_DEV_PM_OPS,
+                .of_match_table = i2c_pxa_dt_ids,
         },
         .id_table       = i2c_pxa_id_table,
 };