1 files changed, 191 insertions, 6 deletions

diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index 22bb247d0e60..85dbf34382e1 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -6,6 +6,9 @@
  * Copyright (c) 2003, 2004 Zultys Technologies.
  * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
  *
+ * Copyright (c) 2008 PIKA Technologies
+ * Sean MacLennan <smaclennan@pikatech.com>
+ *
  * Based on original work by
  *      Ian DaSilva  <idasilva@mvista.com>
  *      Armin Kuster <akuster@mvista.com>
@@ -39,12 +42,17 @@
 #include <asm/io.h>
 #include <linux/i2c.h>
 #include <linux/i2c-id.h>
+
+#ifdef CONFIG_IBM_OCP
 #include <asm/ocp.h>
 #include <asm/ibm4xx.h>
+#else
+#include <linux/of_platform.h>
+#endif
 
 #include "i2c-ibm_iic.h"
 
-#define DRIVER_VERSION "2.1"
+#define DRIVER_VERSION "2.2"
 
 MODULE_DESCRIPTION("IBM IIC driver v" DRIVER_VERSION);
 MODULE_LICENSE("GPL");
@@ -650,13 +658,14 @@ static inline u8 iic_clckdiv(unsigned int opb)
         opb /= 1000000;
 
         if (opb < 20 || opb > 150){
-                printk(KERN_CRIT "ibm-iic: invalid OPB clock frequency %u MHz\n",
+                printk(KERN_WARNING "ibm-iic: invalid OPB clock frequency %u MHz\n",
                         opb);
                 opb = opb < 20 ? 20 : 150;
         }
         return (u8)((opb + 9) / 10 - 1);
 }
 
+#ifdef CONFIG_IBM_OCP
 /*
  * Register single IIC interface
  */
@@ -672,7 +681,7 @@ static int __devinit iic_probe(struct ocp_device *ocp){
                         ocp->def->index);
 
         if (!(dev = kzalloc(sizeof(*dev), GFP_KERNEL))) {
-                printk(KERN_CRIT "ibm-iic%d: failed to allocate device data\n",
+                printk(KERN_ERR "ibm-iic%d: failed to allocate device data\n",
                         ocp->def->index);
                 return -ENOMEM;
         }
@@ -687,7 +696,7 @@ static int __devinit iic_probe(struct ocp_device *ocp){
         }
 
         if (!(dev->vaddr = ioremap(ocp->def->paddr, sizeof(struct iic_regs)))){
-                printk(KERN_CRIT "ibm-iic%d: failed to ioremap device registers\n",
+                printk(KERN_ERR "ibm-iic%d: failed to ioremap device registers\n",
                         dev->idx);
                 ret = -ENXIO;
                 goto fail2;
@@ -745,7 +754,7 @@ static int __devinit iic_probe(struct ocp_device *ocp){
         adap->nr = dev->idx >= 0 ? dev->idx : 0;
 
         if ((ret = i2c_add_numbered_adapter(adap)) < 0) {
-                printk(KERN_CRIT "ibm-iic%d: failed to register i2c adapter\n",
+                printk(KERN_ERR "ibm-iic%d: failed to register i2c adapter\n",
                         dev->idx);
                 goto fail;
         }
@@ -778,7 +787,7 @@ static void __devexit iic_remove(struct ocp_device *ocp)
         struct ibm_iic_private* dev = (struct ibm_iic_private*)ocp_get_drvdata(ocp);
         BUG_ON(dev == NULL);
         if (i2c_del_adapter(&dev->adap)){
-                printk(KERN_CRIT "ibm-iic%d: failed to delete i2c adapter :(\n",
+                printk(KERN_ERR "ibm-iic%d: failed to delete i2c adapter :(\n",
                         dev->idx);
                 /* That's *very* bad, just shutdown IRQ ... */
                 if (dev->irq >= 0){
@@ -828,5 +837,181 @@ static void __exit iic_exit(void)
         ocp_unregister_driver(&ibm_iic_driver);
 }
 
+#else  /* !CONFIG_IBM_OCP */
+
+static int __devinit iic_request_irq(struct of_device *ofdev,
+                                     struct ibm_iic_private *dev)
+{
+        struct device_node *np = ofdev->node;
+        int irq;
+
+        if (iic_force_poll)
+                return NO_IRQ;
+
+        irq = irq_of_parse_and_map(np, 0);
+        if (irq == NO_IRQ) {
+                dev_err(&ofdev->dev, "irq_of_parse_and_map failed\n");
+                return NO_IRQ;
+        }
+
+        /* Disable interrupts until we finish initialization, assumes
+         *  level-sensitive IRQ setup...
+         */
+        iic_interrupt_mode(dev, 0);
+        if (request_irq(irq, iic_handler, 0, "IBM IIC", dev)) {
+                dev_err(&ofdev->dev, "request_irq %d failed\n", irq);
+                /* Fallback to the polling mode */
+                return NO_IRQ;
+        }
+
+        return irq;
+}
+
+/*
+ * Register single IIC interface
+ */
+static int __devinit iic_probe(struct of_device *ofdev,
+                               const struct of_device_id *match)
+{
+        struct device_node *np = ofdev->node;
+        struct ibm_iic_private *dev;
+        struct i2c_adapter *adap;
+        const u32 *indexp, *freq;
+        int ret;
+
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+        if (!dev) {
+                dev_err(&ofdev->dev, "failed to allocate device data\n");
+                return -ENOMEM;
+        }
+
+        dev_set_drvdata(&ofdev->dev, dev);
+
+        indexp = of_get_property(np, "index", NULL);
+        if (!indexp) {
+                dev_err(&ofdev->dev, "no index specified\n");
+                ret = -EINVAL;
+                goto error_cleanup;
+        }
+        dev->idx = *indexp;
+
+        dev->vaddr = of_iomap(np, 0);
+        if (dev->vaddr == NULL) {
+                dev_err(&ofdev->dev, "failed to iomap device\n");
+                ret = -ENXIO;
+                goto error_cleanup;
+        }
+
+        init_waitqueue_head(&dev->wq);
+
+        dev->irq = iic_request_irq(ofdev, dev);
+        if (dev->irq == NO_IRQ)
+                dev_warn(&ofdev->dev, "using polling mode\n");
+
+        /* Board specific settings */
+        if (iic_force_fast || of_get_property(np, "fast-mode", NULL))
+                dev->fast_mode = 1;
+
+        freq = of_get_property(np, "clock-frequency", NULL);
+        if (freq == NULL) {
+                freq = of_get_property(np->parent, "clock-frequency", NULL);
+                if (freq == NULL) {
+                        dev_err(&ofdev->dev, "Unable to get bus frequency\n");
+                        ret = -EINVAL;
+                        goto error_cleanup;
+                }
+        }
+
+        dev->clckdiv = iic_clckdiv(*freq);
+        dev_dbg(&ofdev->dev, "clckdiv = %d\n", dev->clckdiv);
+
+        /* Initialize IIC interface */
+        iic_dev_init(dev);
+
+        /* Register it with i2c layer */
+        adap = &dev->adap;
+        adap->dev.parent = &ofdev->dev;
+        strlcpy(adap->name, "IBM IIC", sizeof(adap->name));
+        i2c_set_adapdata(adap, dev);
+        adap->id = I2C_HW_OCP;
+        adap->class = I2C_CLASS_HWMON;
+        adap->algo = &iic_algo;
+        adap->timeout = 1;
+        adap->nr = dev->idx;
+
+        ret = i2c_add_numbered_adapter(adap);
+        if (ret  < 0) {
+                dev_err(&ofdev->dev, "failed to register i2c adapter\n");
+                goto error_cleanup;
+        }
+
+        dev_info(&ofdev->dev, "using %s mode\n",
+                 dev->fast_mode ? "fast (400 kHz)" : "standard (100 kHz)");
+
+        return 0;
+
+error_cleanup:
+        if (dev->irq != NO_IRQ) {
+                iic_interrupt_mode(dev, 0);
+                free_irq(dev->irq, dev);
+        }
+
+        if (dev->vaddr)
+                iounmap(dev->vaddr);
+
+        dev_set_drvdata(&ofdev->dev, NULL);
+        kfree(dev);
+        return ret;
+}
+
+/*
+ * Cleanup initialized IIC interface
+ */
+static int __devexit iic_remove(struct of_device *ofdev)
+{
+        struct ibm_iic_private *dev = dev_get_drvdata(&ofdev->dev);
+
+        dev_set_drvdata(&ofdev->dev, NULL);
+
+        i2c_del_adapter(&dev->adap);
+
+        if (dev->irq != NO_IRQ) {
+                iic_interrupt_mode(dev, 0);
+                free_irq(dev->irq, dev);
+        }
+
+        iounmap(dev->vaddr);
+        kfree(dev);
+
+        return 0;
+}
+
+static const struct of_device_id ibm_iic_match[] = {
+        { .compatible = "ibm,iic-405ex", },
+        { .compatible = "ibm,iic-405gp", },
+        { .compatible = "ibm,iic-440gp", },
+        { .compatible = "ibm,iic-440gpx", },
+        { .compatible = "ibm,iic-440grx", },
+        {}
+};
+
+static struct of_platform_driver ibm_iic_driver = {
+        .name   = "ibm-iic",
+        .match_table = ibm_iic_match,
+        .probe  = iic_probe,
+        .remove = __devexit_p(iic_remove),
+};
+
+static int __init iic_init(void)
+{
+        return of_register_platform_driver(&ibm_iic_driver);
+}
+
+static void __exit iic_exit(void)
+{
+        of_unregister_platform_driver(&ibm_iic_driver);
+}
+#endif /* CONFIG_IBM_OCP */
+
 module_init(iic_init);
 module_exit(iic_exit);