1 files changed, 89 insertions, 26 deletions

diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index f4c19a97e0b3..f59224a5c761 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -29,38 +29,75 @@
 #include <linux/errno.h>
 #include <linux/interrupt.h>
 #include <linux/i2c-pxa.h>
+#include <linux/of_i2c.h>
 #include <linux/platform_device.h>
 #include <linux/err.h>
 #include <linux/clk.h>
 #include <linux/slab.h>
 #include <linux/io.h>
+#include <linux/i2c/pxa-i2c.h>
 
 #include <asm/irq.h>
-#include <plat/i2c.h>
+
+#ifndef CONFIG_HAVE_CLK
+#define clk_get(dev, id)        NULL
+#define clk_put(clk)            do { } while (0)
+#define clk_disable(clk)        do { } while (0)
+#define clk_enable(clk)         do { } while (0)
+#endif
+
+struct pxa_reg_layout {
+        u32 ibmr;
+        u32 idbr;
+        u32 icr;
+        u32 isr;
+        u32 isar;
+};
+
+enum pxa_i2c_types {
+        REGS_PXA2XX,
+        REGS_PXA3XX,
+        REGS_CE4100,
+};
 
 /*
- * I2C register offsets will be shifted 0 or 1 bit left, depending on
- * different SoCs
+ * I2C registers definitions
  */
-#define REG_SHIFT_0     (0 << 0)
-#define REG_SHIFT_1     (1 << 0)
-#define REG_SHIFT(d)    ((d) & 0x1)
+static struct pxa_reg_layout pxa_reg_layout[] = {
+        [REGS_PXA2XX] = {
+                .ibmr = 0x00,
+                .idbr = 0x08,
+                .icr =  0x10,
+                .isr =  0x18,
+                .isar = 0x20,
+        },
+        [REGS_PXA3XX] = {
+                .ibmr = 0x00,
+                .idbr = 0x04,
+                .icr =  0x08,
+                .isr =  0x0c,
+                .isar = 0x10,
+        },
+        [REGS_CE4100] = {
+                .ibmr = 0x14,
+                .idbr = 0x0c,
+                .icr =  0x00,
+                .isr =  0x04,
+                /* no isar register */
+        },
+};
 
 static const struct platform_device_id i2c_pxa_id_table[] = {
-        { "pxa2xx-i2c",         REG_SHIFT_1 },
-        { "pxa3xx-pwri2c",      REG_SHIFT_0 },
+        { "pxa2xx-i2c",         REGS_PXA2XX },
+        { "pxa3xx-pwri2c",      REGS_PXA3XX },
+        { "ce4100-i2c",         REGS_CE4100 },
         { },
 };
 MODULE_DEVICE_TABLE(platform, i2c_pxa_id_table);
 
 /*
- * I2C registers and bit definitions
+ * I2C bit definitions
  */
-#define IBMR            (0x00)
-#define IDBR            (0x08)
-#define ICR             (0x10)
-#define ISR             (0x18)
-#define ISAR            (0x20)
 
 #define ICR_START       (1 << 0)           /* start bit */
 #define ICR_STOP        (1 << 1)           /* stop bit */
@@ -111,7 +148,11 @@ struct pxa_i2c {
         u32                     icrlog[32];
 
         void __iomem            *reg_base;
-        unsigned int            reg_shift;
+        void __iomem            *reg_ibmr;
+        void __iomem            *reg_idbr;
+        void __iomem            *reg_icr;
+        void __iomem            *reg_isr;
+        void __iomem            *reg_isar;
 
         unsigned long           iobase;
         unsigned long           iosize;
@@ -121,11 +162,11 @@ struct pxa_i2c {
         unsigned int            fast_mode :1;
 };
 
-#define _IBMR(i2c)      ((i2c)->reg_base + (0x0 << (i2c)->reg_shift))
-#define _IDBR(i2c)      ((i2c)->reg_base + (0x4 << (i2c)->reg_shift))
-#define _ICR(i2c)       ((i2c)->reg_base + (0x8 << (i2c)->reg_shift))
-#define _ISR(i2c)       ((i2c)->reg_base + (0xc << (i2c)->reg_shift))
-#define _ISAR(i2c)      ((i2c)->reg_base + (0x10 << (i2c)->reg_shift))
+#define _IBMR(i2c)      ((i2c)->reg_ibmr)
+#define _IDBR(i2c)      ((i2c)->reg_idbr)
+#define _ICR(i2c)       ((i2c)->reg_icr)
+#define _ISR(i2c)       ((i2c)->reg_isr)
+#define _ISAR(i2c)      ((i2c)->reg_isar)
 
 /*
  * I2C Slave mode address
@@ -418,7 +459,8 @@ static void i2c_pxa_reset(struct pxa_i2c *i2c)
         writel(I2C_ISR_INIT, _ISR(i2c));
         writel(readl(_ICR(i2c)) & ~ICR_UR, _ICR(i2c));
 
-        writel(i2c->slave_addr, _ISAR(i2c));
+        if (i2c->reg_isar)
+                writel(i2c->slave_addr, _ISAR(i2c));
 
         /* set control register values */
         writel(I2C_ICR_INIT | (i2c->fast_mode ? ICR_FM : 0), _ICR(i2c));
@@ -729,8 +771,10 @@ static int i2c_pxa_do_xfer(struct pxa_i2c *i2c, struct i2c_msg *msg, int num)
          */
         ret = i2c->msg_idx;
 
-        if (timeout == 0)
+        if (!timeout && i2c->msg_num) {
                 i2c_pxa_scream_blue_murder(i2c, "timeout");
+                ret = I2C_RETRY;
+        }
 
  out:
         return ret;
@@ -915,11 +959,16 @@ static void i2c_pxa_irq_rxfull(struct pxa_i2c *i2c, u32 isr)
         writel(icr, _ICR(i2c));
 }
 
+#define VALID_INT_SOURCE        (ISR_SSD | ISR_ALD | ISR_ITE | ISR_IRF | \
+                                ISR_SAD | ISR_BED)
 static irqreturn_t i2c_pxa_handler(int this_irq, void *dev_id)
 {
         struct pxa_i2c *i2c = dev_id;
         u32 isr = readl(_ISR(i2c));
 
+        if (!(isr & VALID_INT_SOURCE))
+                return IRQ_NONE;
+
         if (i2c_debug > 2 && 0) {
                 dev_dbg(&i2c->adap.dev, "%s: ISR=%08x, ICR=%08x, IBMR=%02x\n",
                         __func__, isr, readl(_ICR(i2c)), readl(_IBMR(i2c)));
@@ -934,7 +983,7 @@ static irqreturn_t i2c_pxa_handler(int this_irq, void *dev_id)
         /*
          * Always clear all pending IRQs.
          */
-        writel(isr & (ISR_SSD|ISR_ALD|ISR_ITE|ISR_IRF|ISR_SAD|ISR_BED), _ISR(i2c));
+        writel(isr & VALID_INT_SOURCE, _ISR(i2c));
 
         if (isr & ISR_SAD)
                 i2c_pxa_slave_start(i2c, isr);
@@ -1001,6 +1050,7 @@ static int i2c_pxa_probe(struct platform_device *dev)
         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;
         int ret;
         int irq;
 
@@ -1044,7 +1094,13 @@ static int i2c_pxa_probe(struct platform_device *dev)
                 ret = -EIO;
                 goto eremap;
         }
-        i2c->reg_shift = REG_SHIFT(id->driver_data);
+
+        i2c->reg_ibmr = i2c->reg_base + pxa_reg_layout[i2c_type].ibmr;
+        i2c->reg_idbr = i2c->reg_base + pxa_reg_layout[i2c_type].idbr;
+        i2c->reg_icr = i2c->reg_base + pxa_reg_layout[i2c_type].icr;
+        i2c->reg_isr = i2c->reg_base + pxa_reg_layout[i2c_type].isr;
+        if (i2c_type != REGS_CE4100)
+                i2c->reg_isar = i2c->reg_base + pxa_reg_layout[i2c_type].isar;
 
         i2c->iobase = res->start;
         i2c->iosize = resource_size(res);
@@ -1072,7 +1128,7 @@ static int i2c_pxa_probe(struct platform_device *dev)
                 i2c->adap.algo = &i2c_pxa_pio_algorithm;
         } else {
                 i2c->adap.algo = &i2c_pxa_algorithm;
-                ret = request_irq(irq, i2c_pxa_handler, IRQF_DISABLED,
+                ret = request_irq(irq, i2c_pxa_handler, IRQF_SHARED,
                                   i2c->adap.name, i2c);
                 if (ret)
                         goto ereqirq;
@@ -1082,12 +1138,19 @@ static int i2c_pxa_probe(struct platform_device *dev)
 
         i2c->adap.algo_data = i2c;
         i2c->adap.dev.parent = &dev->dev;
+#ifdef CONFIG_OF
+        i2c->adap.dev.of_node = dev->dev.of_node;
+#endif
 
-        ret = i2c_add_numbered_adapter(&i2c->adap);
+        if (i2c_type == REGS_CE4100)
+                ret = i2c_add_adapter(&i2c->adap);
+        else
+                ret = i2c_add_numbered_adapter(&i2c->adap);
         if (ret < 0) {
                 printk(KERN_INFO "I2C: Failed to add bus\n");
                 goto eadapt;
         }
+        of_i2c_register_devices(&i2c->adap);
 
         platform_set_drvdata(dev, i2c);