4 files changed, 55 insertions, 43 deletions

diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c
index 228f75723063..3fcf78e906db 100644
--- a/drivers/i2c/busses/i2c-cpm.c
+++ b/drivers/i2c/busses/i2c-cpm.c
@@ -365,6 +365,7 @@ static int cpm_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
                 pmsg = &msgs[tptr];
                 if (pmsg->flags & I2C_M_RD)
                         ret = wait_event_interruptible_timeout(cpm->i2c_wait,
+                                (in_be16(&tbdf[tptr].cbd_sc) & BD_SC_NAK) ||
                                 !(in_be16(&rbdf[rptr].cbd_sc) & BD_SC_EMPTY),
                                 1 * HZ);
                 else
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 906f9b9d715d..587f5b2380d4 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -1016,7 +1016,7 @@ static int i2c_pxa_probe(struct platform_device *dev)
         snprintf(i2c->adap.name, sizeof(i2c->adap.name), "pxa_i2c-i2c.%u",
                  i2c->adap.nr);
 
-        i2c->clk = clk_get(&dev->dev, "I2CCLK");
+        i2c->clk = clk_get(&dev->dev, NULL);
         if (IS_ERR(i2c->clk)) {
                 ret = PTR_ERR(i2c->clk);
                 goto eclk;
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index 2a0de645ccf3..f69f91ffb469 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -38,8 +38,8 @@
 #include <asm/irq.h>
 #include <asm/io.h>
 
-#include <asm/plat-s3c/regs-iic.h>
-#include <asm/plat-s3c/iic.h>
+#include <plat/regs-iic.h>
+#include <plat/iic.h>
 
 /* i2c controller state */
 
@@ -54,6 +54,7 @@ enum s3c24xx_i2c_state {
 struct s3c24xx_i2c {
         spinlock_t              lock;
         wait_queue_head_t       wait;
+        unsigned int            suspended:1;
 
         struct i2c_msg          *msg;
         unsigned int            msg_num;
@@ -476,7 +477,7 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c,
         unsigned long timeout;
         int ret;
 
-        if (!(readl(i2c->regs + S3C2410_IICCON) & S3C2410_IICCON_IRQEN))
+        if (i2c->suspended)
                 return -EIO;
 
         ret = s3c24xx_i2c_set_master(i2c);
@@ -957,17 +958,26 @@ static int s3c24xx_i2c_remove(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_PM
+static int s3c24xx_i2c_suspend_late(struct platform_device *dev,
+                                    pm_message_t msg)
+{
+        struct s3c24xx_i2c *i2c = platform_get_drvdata(dev);
+        i2c->suspended = 1;
+        return 0;
+}
+
 static int s3c24xx_i2c_resume(struct platform_device *dev)
 {
         struct s3c24xx_i2c *i2c = platform_get_drvdata(dev);
 
-        if (i2c != NULL)
-                s3c24xx_i2c_init(i2c);
+        i2c->suspended = 0;
+        s3c24xx_i2c_init(i2c);
 
         return 0;
 }
 
 #else
+#define s3c24xx_i2c_suspend_late NULL
 #define s3c24xx_i2c_resume NULL
 #endif
 
@@ -976,6 +986,7 @@ static int s3c24xx_i2c_resume(struct platform_device *dev)
 static struct platform_driver s3c2410_i2c_driver = {
         .probe          = s3c24xx_i2c_probe,
         .remove         = s3c24xx_i2c_remove,
+        .suspend_late   = s3c24xx_i2c_suspend_late,
         .resume         = s3c24xx_i2c_resume,
         .driver         = {
                 .owner  = THIS_MODULE,
@@ -986,6 +997,7 @@ static struct platform_driver s3c2410_i2c_driver = {
 static struct platform_driver s3c2440_i2c_driver = {
         .probe          = s3c24xx_i2c_probe,
         .remove         = s3c24xx_i2c_remove,
+        .suspend_late   = s3c24xx_i2c_suspend_late,
         .resume         = s3c24xx_i2c_resume,
         .driver         = {
                 .owner  = THIS_MODULE,
diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c
index 3384a717fec0..6c3d60b939bf 100644
--- a/drivers/i2c/busses/i2c-sh_mobile.c
+++ b/drivers/i2c/busses/i2c-sh_mobile.c
@@ -160,9 +160,39 @@ struct sh_mobile_i2c_data {
 
 static void activate_ch(struct sh_mobile_i2c_data *pd)
 {
+        unsigned long i2c_clk;
+        u_int32_t num;
+        u_int32_t denom;
+        u_int32_t tmp;
+
         /* Make sure the clock is enabled */
         clk_enable(pd->clk);
 
+        /* Get clock rate after clock is enabled */
+        i2c_clk = clk_get_rate(pd->clk);
+
+        /* Calculate the value for iccl. From the data sheet:
+         * iccl = (p clock / transfer rate) * (L / (L + H))
+         * where L and H are the SCL low/high ratio (5/4 in this case).
+         * We also round off the result.
+         */
+        num = i2c_clk * 5;
+        denom = NORMAL_SPEED * 9;
+        tmp = num * 10 / denom;
+        if (tmp % 10 >= 5)
+                pd->iccl = (u_int8_t)((num/denom) + 1);
+        else
+                pd->iccl = (u_int8_t)(num/denom);
+
+        /* Calculate the value for icch. From the data sheet:
+           icch = (p clock / transfer rate) * (H / (L + H)) */
+        num = i2c_clk * 4;
+        tmp = num * 10 / denom;
+        if (tmp % 10 >= 5)
+                pd->icch = (u_int8_t)((num/denom) + 1);
+        else
+                pd->icch = (u_int8_t)(num/denom);
+
         /* Enable channel and configure rx ack */
         iowrite8(ioread8(ICCR(pd)) | ICCR_ICE, ICCR(pd));
 
@@ -459,40 +489,6 @@ static struct i2c_algorithm sh_mobile_i2c_algorithm = {
         .master_xfer    = sh_mobile_i2c_xfer,
 };
 
-static void sh_mobile_i2c_setup_channel(struct platform_device *dev)
-{
-        struct sh_mobile_i2c_data *pd = platform_get_drvdata(dev);
-        unsigned long peripheral_clk = clk_get_rate(pd->clk);
-        u_int32_t num;
-        u_int32_t denom;
-        u_int32_t tmp;
-
-        spin_lock_init(&pd->lock);
-        init_waitqueue_head(&pd->wait);
-
-        /* Calculate the value for iccl. From the data sheet:
-         * iccl = (p clock / transfer rate) * (L / (L + H))
-         * where L and H are the SCL low/high ratio (5/4 in this case).
-         * We also round off the result.
-         */
-        num = peripheral_clk * 5;
-        denom = NORMAL_SPEED * 9;
-        tmp = num * 10 / denom;
-        if (tmp % 10 >= 5)
-                pd->iccl = (u_int8_t)((num/denom) + 1);
-        else
-                pd->iccl = (u_int8_t)(num/denom);
-
-        /* Calculate the value for icch. From the data sheet:
-           icch = (p clock / transfer rate) * (H / (L + H)) */
-        num = peripheral_clk * 4;
-        tmp = num * 10 / denom;
-        if (tmp % 10 >= 5)
-                pd->icch = (u_int8_t)((num/denom) + 1);
-        else
-                pd->icch = (u_int8_t)(num/denom);
-}
-
 static int sh_mobile_i2c_hook_irqs(struct platform_device *dev, int hook)
 {
         struct resource *res;
@@ -533,6 +529,7 @@ static int sh_mobile_i2c_probe(struct platform_device *dev)
         struct sh_mobile_i2c_data *pd;
         struct i2c_adapter *adap;
         struct resource *res;
+        char clk_name[8];
         int size;
         int ret;
 
@@ -542,9 +539,10 @@ static int sh_mobile_i2c_probe(struct platform_device *dev)
                 return -ENOMEM;
         }
 
-        pd->clk = clk_get(&dev->dev, "peripheral_clk");
+        snprintf(clk_name, sizeof(clk_name), "i2c%d", dev->id);
+        pd->clk = clk_get(&dev->dev, clk_name);
         if (IS_ERR(pd->clk)) {
-                dev_err(&dev->dev, "cannot get peripheral clock\n");
+                dev_err(&dev->dev, "cannot get clock \"%s\"\n", clk_name);
                 ret = PTR_ERR(pd->clk);
                 goto err;
         }
@@ -586,7 +584,8 @@ static int sh_mobile_i2c_probe(struct platform_device *dev)
 
         strlcpy(adap->name, dev->name, sizeof(adap->name));
 
-        sh_mobile_i2c_setup_channel(dev);
+        spin_lock_init(&pd->lock);
+        init_waitqueue_head(&pd->wait);
 
         ret = i2c_add_numbered_adapter(adap);
         if (ret < 0) {