i2c-nomadik: print abort cause only on abort tag

Modify the code to:
1)Print the cause of i2c failure only if the status is set to ABORT.
2)Print slave address on send/receive fail, will help in which slave
failed.

Signed-off-by: Virupax Sadashivpetimath <virupax.sadashivpetimath@stericsson.com>
Reviewed-by: Jonas Aberg <jonas.aberg@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>

diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index 28389c29af75c9d1996c7d8cdafa5ff7f06d9d5f..c8bf81abcd3cb5b2ef440328e1bdf7a2a0f60329 100644 (file)
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -442,7 +442,8 @@ static int read_i2c(struct nmk_i2c_dev *dev)
 
        if (timeout == 0) {
                /* controller has timedout, re-init the h/w */
-               dev_err(&dev->pdev->dev, "controller timed out, re-init h/w\n");
+               dev_err(&dev->pdev->dev, "read from slave 0x%x timed out\n",
+                               dev->cli.slave_adr);
                (void) init_hw(dev);
                status = -ETIMEDOUT;
        }
@@ -506,7 +507,8 @@ static int write_i2c(struct nmk_i2c_dev *dev)
 
        if (timeout == 0) {
                /* controller has timedout, re-init the h/w */
-               dev_err(&dev->pdev->dev, "controller timed out, re-init h/w\n");
+               dev_err(&dev->pdev->dev, "write to slave 0x%x timed out\n",
+                               dev->cli.slave_adr);
                (void) init_hw(dev);
                status = -ETIMEDOUT;
        }
@@ -568,6 +570,7 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap,
        int i;
        u32 cause;
        struct nmk_i2c_dev *dev = i2c_get_adapdata(i2c_adap);
+       u32 i2c_sr;
 
        dev->busy = true;
 
@@ -607,14 +610,22 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap,
                        status = write_i2c(dev);
                }
                if (status || (dev->result)) {
-                       /* get the abort cause */
-                       cause = (readl(dev->virtbase + I2C_SR) >> 4) & 0x7;
-                       dev_err(&dev->pdev->dev, "%s\n",
-                               cause >= ARRAY_SIZE(abort_causes)
-                               ? "unknown reason" : abort_causes[cause]);
+                       i2c_sr = readl(dev->virtbase + I2C_SR);
+                       /*
+                        * Check if the controller I2C operation status is set
+                        * to ABORT(11b).
+                        */
+                       if (((i2c_sr >> 2) & 0x3) == 0x3) {
+                               /* get the abort cause */
+                               cause = (i2c_sr >> 4)
+                                       & 0x7;
+                               dev_err(&dev->pdev->dev, "%s\n", cause >=
+                                               ARRAY_SIZE(abort_causes) ?
+                                               "unknown reason" :
+                                               abort_causes[cause]);
+                       }
 
                        status = status ? status : dev->result;
-
                        goto out;
                }
                udelay(I2C_DELAY);