7 files changed, 73 insertions, 38 deletions

diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c
index 3fae3a91ce5b..c89687a10835 100644
--- a/drivers/i2c/busses/i2c-davinci.c
+++ b/drivers/i2c/busses/i2c-davinci.c
@@ -187,6 +187,11 @@ static int i2c_davinci_init(struct davinci_i2c_dev *dev)
         davinci_i2c_write_reg(dev, DAVINCI_I2C_CLKH_REG, clkh);
         davinci_i2c_write_reg(dev, DAVINCI_I2C_CLKL_REG, clkl);
 
+        /* Respond at reserved "SMBus Host" slave address" (and zero);
+         * we seem to have no option to not respond...
+         */
+        davinci_i2c_write_reg(dev, DAVINCI_I2C_OAR_REG, 0x08);
+
         dev_dbg(dev->dev, "input_clock = %d, CLK = %d\n", input_clock, clk);
         dev_dbg(dev->dev, "PSC  = %d\n",
                 davinci_i2c_read_reg(dev, DAVINCI_I2C_PSC_REG));
@@ -387,7 +392,7 @@ static void terminate_write(struct davinci_i2c_dev *dev)
         davinci_i2c_write_reg(dev, DAVINCI_I2C_MDR_REG, w);
 
         if (!dev->terminate)
-                dev_err(dev->dev, "TDR IRQ while no data to send\n");
+                dev_dbg(dev->dev, "TDR IRQ while no data to send\n");
 }
 
 /*
@@ -473,9 +478,14 @@ static irqreturn_t i2c_davinci_isr(int this_irq, void *dev_id)
                         break;
 
                 case DAVINCI_I2C_IVR_AAS:
-                        dev_warn(dev->dev, "Address as slave interrupt\n");
-                }/* switch */
-        }/* while */
+                        dev_dbg(dev->dev, "Address as slave interrupt\n");
+                        break;
+
+                default:
+                        dev_warn(dev->dev, "Unrecognized irq stat %d\n", stat);
+                        break;
+                }
+        }
 
         return count ? IRQ_HANDLED : IRQ_NONE;
 }
@@ -505,7 +515,7 @@ static int davinci_i2c_probe(struct platform_device *pdev)
                 return -ENODEV;
         }
 
-        ioarea = request_mem_region(mem->start, (mem->end - mem->start) + 1,
+        ioarea = request_mem_region(mem->start, resource_size(mem),
                                     pdev->name);
         if (!ioarea) {
                 dev_err(&pdev->dev, "I2C region already claimed\n");
@@ -523,7 +533,7 @@ static int davinci_i2c_probe(struct platform_device *pdev)
         dev->irq = irq->start;
         platform_set_drvdata(pdev, dev);
 
-        dev->clk = clk_get(&pdev->dev, "I2CCLK");
+        dev->clk = clk_get(&pdev->dev, NULL);
         if (IS_ERR(dev->clk)) {
                 r = -ENODEV;
                 goto err_free_mem;
@@ -568,7 +578,7 @@ err_free_mem:
         put_device(&pdev->dev);
         kfree(dev);
 err_release_region:
-        release_mem_region(mem->start, (mem->end - mem->start) + 1);
+        release_mem_region(mem->start, resource_size(mem));
 
         return r;
 }
@@ -591,7 +601,7 @@ static int davinci_i2c_remove(struct platform_device *pdev)
         kfree(dev);
 
         mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        release_mem_region(mem->start, (mem->end - mem->start) + 1);
+        release_mem_region(mem->start, resource_size(mem));
         return 0;
 }
 
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index e4476743f203..b1bc6e277d2a 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -85,10 +85,11 @@ static void dump_iic_regs(const char* header, struct ibm_iic_private* dev)
 {
         volatile struct iic_regs __iomem *iic = dev->vaddr;
         printk(KERN_DEBUG "ibm-iic%d: %s\n", dev->idx, header);
-        printk(KERN_DEBUG "  cntl     = 0x%02x, mdcntl = 0x%02x\n"
-               KERN_DEBUG "  sts      = 0x%02x, extsts = 0x%02x\n"
-               KERN_DEBUG "  clkdiv   = 0x%02x, xfrcnt = 0x%02x\n"
-               KERN_DEBUG "  xtcntlss = 0x%02x, directcntl = 0x%02x\n",
+        printk(KERN_DEBUG
+               "  cntl     = 0x%02x, mdcntl = 0x%02x\n"
+               "  sts      = 0x%02x, extsts = 0x%02x\n"
+               "  clkdiv   = 0x%02x, xfrcnt = 0x%02x\n"
+               "  xtcntlss = 0x%02x, directcntl = 0x%02x\n",
                 in_8(&iic->cntl), in_8(&iic->mdcntl), in_8(&iic->sts),
                 in_8(&iic->extsts), in_8(&iic->clkdiv), in_8(&iic->xfrcnt),
                 in_8(&iic->xtcntlss), in_8(&iic->directcntl));
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index ad8d2010c921..d258b02aef44 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -672,9 +672,10 @@ omap_i2c_isr(int this_irq, void *dev_id)
                         break;
                 }
 
+                err = 0;
+complete:
                 omap_i2c_write_reg(dev, OMAP_I2C_STAT_REG, stat);
 
-                err = 0;
                 if (stat & OMAP_I2C_STAT_NACK) {
                         err |= OMAP_I2C_STAT_NACK;
                         omap_i2c_write_reg(dev, OMAP_I2C_CON_REG,
@@ -685,16 +686,19 @@ omap_i2c_isr(int this_irq, void *dev_id)
                         err |= OMAP_I2C_STAT_AL;
                 }
                 if (stat & (OMAP_I2C_STAT_ARDY | OMAP_I2C_STAT_NACK |
-                                        OMAP_I2C_STAT_AL))
+                                        OMAP_I2C_STAT_AL)) {
                         omap_i2c_complete_cmd(dev, err);
+                        return IRQ_HANDLED;
+                }
                 if (stat & (OMAP_I2C_STAT_RRDY | OMAP_I2C_STAT_RDR)) {
                         u8 num_bytes = 1;
                         if (dev->fifo_size) {
                                 if (stat & OMAP_I2C_STAT_RRDY)
                                         num_bytes = dev->fifo_size;
-                                else
-                                        num_bytes = omap_i2c_read_reg(dev,
-                                                        OMAP_I2C_BUFSTAT_REG);
+                                else    /* read RXSTAT on RDR interrupt */
+                                        num_bytes = (omap_i2c_read_reg(dev,
+                                                        OMAP_I2C_BUFSTAT_REG)
+                                                        >> 8) & 0x3F;
                         }
                         while (num_bytes) {
                                 num_bytes--;
@@ -731,9 +735,10 @@ omap_i2c_isr(int this_irq, void *dev_id)
                         if (dev->fifo_size) {
                                 if (stat & OMAP_I2C_STAT_XRDY)
                                         num_bytes = dev->fifo_size;
-                                else
+                                else    /* read TXSTAT on XDR interrupt */
                                         num_bytes = omap_i2c_read_reg(dev,
-                                                        OMAP_I2C_BUFSTAT_REG);
+                                                        OMAP_I2C_BUFSTAT_REG)
+                                                        & 0x3F;
                         }
                         while (num_bytes) {
                                 num_bytes--;
@@ -760,6 +765,27 @@ omap_i2c_isr(int this_irq, void *dev_id)
                                                         "data to send\n");
                                         break;
                                 }
+
+                                /*
+                                 * OMAP3430 Errata 1.153: When an XRDY/XDR
+                                 * is hit, wait for XUDF before writing data
+                                 * to DATA_REG. Otherwise some data bytes can
+                                 * be lost while transferring them from the
+                                 * memory to the I2C interface.
+                                 */
+
+                                if (cpu_is_omap34xx()) {
+                                                while (!(stat & OMAP_I2C_STAT_XUDF)) {
+                                                        if (stat & (OMAP_I2C_STAT_NACK | OMAP_I2C_STAT_AL)) {
+                                                                omap_i2c_ack_stat(dev, stat & (OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XDR));
+                                                                err |= OMAP_I2C_STAT_XUDF;
+                                                                goto complete;
+                                                        }
+                                                        cpu_relax();
+                                                        stat = omap_i2c_read_reg(dev, OMAP_I2C_STAT_REG);
+                                                }
+                                }
+
                                 omap_i2c_write_reg(dev, OMAP_I2C_DATA_REG, w);
                         }
                         omap_i2c_ack_stat(dev,
@@ -806,7 +832,7 @@ omap_i2c_probe(struct platform_device *pdev)
                 return -ENODEV;
         }
 
-        ioarea = request_mem_region(mem->start, (mem->end - mem->start) + 1,
+        ioarea = request_mem_region(mem->start, resource_size(mem),
                         pdev->name);
         if (!ioarea) {
                 dev_err(&pdev->dev, "I2C region already claimed\n");
@@ -879,7 +905,7 @@ omap_i2c_probe(struct platform_device *pdev)
         i2c_set_adapdata(adap, dev);
         adap->owner = THIS_MODULE;
         adap->class = I2C_CLASS_HWMON;
-        strncpy(adap->name, "OMAP I2C adapter", sizeof(adap->name));
+        strlcpy(adap->name, "OMAP I2C adapter", sizeof(adap->name));
         adap->algo = &omap_i2c_algo;
         adap->dev.parent = &pdev->dev;
 
@@ -905,7 +931,7 @@ err_free_mem:
         platform_set_drvdata(pdev, NULL);
         kfree(dev);
 err_release_region:
-        release_mem_region(mem->start, (mem->end - mem->start) + 1);
+        release_mem_region(mem->start, resource_size(mem));
 
         return r;
 }
@@ -925,7 +951,7 @@ omap_i2c_remove(struct platform_device *pdev)
         iounmap(dev->base);
         kfree(dev);
         mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        release_mem_region(mem->start, (mem->end - mem->start) + 1);
+        release_mem_region(mem->start, resource_size(mem));
         return 0;
 }
 
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index 8f42a4536cdf..20bb0ceb027b 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -763,11 +763,6 @@ static int s3c24xx_i2c_init(struct s3c24xx_i2c *i2c)
         dev_info(i2c->dev, "bus frequency set to %d KHz\n", freq);
         dev_dbg(i2c->dev, "S3C2410_IICCON=0x%02lx\n", iicon);
 
-        /* check for s3c2440 i2c controller  */
-
-        if (s3c24xx_i2c_is2440(i2c))
-                writel(0x0, i2c->regs + S3C2440_IICLC);
-
         return 0;
 }
 
diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c
index 1c01083b01b5..820487d0d5c7 100644
--- a/drivers/i2c/busses/i2c-sh_mobile.c
+++ b/drivers/i2c/busses/i2c-sh_mobile.c
@@ -563,7 +563,7 @@ static int sh_mobile_i2c_probe(struct platform_device *dev)
                 goto err_irq;
         }
 
-        size = (res->end - res->start) + 1;
+        size = resource_size(res);
 
         pd->reg = ioremap(res->start, size);
         if (pd->reg == NULL) {
@@ -637,7 +637,7 @@ static void __exit sh_mobile_i2c_adap_exit(void)
         platform_driver_unregister(&sh_mobile_i2c_driver);
 }
 
-module_init(sh_mobile_i2c_adap_init);
+subsys_initcall(sh_mobile_i2c_adap_init);
 module_exit(sh_mobile_i2c_adap_exit);
 
 MODULE_DESCRIPTION("SuperH Mobile I2C Bus Controller driver");
diff --git a/drivers/i2c/busses/i2c-simtec.c b/drivers/i2c/busses/i2c-simtec.c
index 042fda295f3a..6407f47bda82 100644
--- a/drivers/i2c/busses/i2c-simtec.c
+++ b/drivers/i2c/busses/i2c-simtec.c
@@ -92,7 +92,7 @@ static int simtec_i2c_probe(struct platform_device *dev)
                 goto err;
         }
 
-        size = (res->end-res->start)+1;
+        size = resource_size(res);
 
         pd->ioarea = request_mem_region(res->start, size, dev->name);
         if (pd->ioarea == NULL) {
diff --git a/drivers/i2c/chips/tsl2550.c b/drivers/i2c/chips/tsl2550.c
index 1a9cc135219f..b96f3025e588 100644
--- a/drivers/i2c/chips/tsl2550.c
+++ b/drivers/i2c/chips/tsl2550.c
@@ -27,7 +27,7 @@
 #include <linux/delay.h>
 
 #define TSL2550_DRV_NAME        "tsl2550"
-#define DRIVER_VERSION          "1.1.1"
+#define DRIVER_VERSION          "1.1.2"
 
 /*
  * Defines
@@ -189,13 +189,16 @@ static int tsl2550_calculate_lux(u8 ch0, u8 ch1)
         u8 r = 128;
 
         /* Avoid division by 0 and count 1 cannot be greater than count 0 */
-        if (c0 && (c1 <= c0))
-                r = c1 * 128 / c0;
+        if (c1 <= c0)
+                if (c0) {
+                        r = c1 * 128 / c0;
+
+                        /* Calculate LUX */
+                        lux = ((c0 - c1) * ratio_lut[r]) / 256;
+                } else
+                        lux = 0;
         else
-                return -1;
-
-        /* Calculate LUX */
-        lux = ((c0 - c1) * ratio_lut[r]) / 256;
+                return -EAGAIN;
 
         /* LUX range check */
         return lux > TSL2550_MAX_LUX ? TSL2550_MAX_LUX : lux;