lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

i2c-nomadik: print abort cause only on abort tag

Browse Source 
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>
This commit is contained in:
Virupax Sadashivpetimath
2011-05-13 12:29:55 +02:00
committed by Ben Dooks
parent cd20e4fa91
commit 4cb3f538cd
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/i2c/busses/i2c-nomadik.c
View File

@@ -442,7 +442,8 @@ static int read_i2c(struct nmk_i2c_dev *dev)
if (timeout == 0) { if (timeout == 0) {
/* controller has timedout, re-init the h/w */ /* 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); (void) init_hw(dev);
status = -ETIMEDOUT; status = -ETIMEDOUT;
} }
@@ -506,7 +507,8 @@ static int write_i2c(struct nmk_i2c_dev *dev)
if (timeout == 0) { if (timeout == 0) {
/* controller has timedout, re-init the h/w */ /* 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); (void) init_hw(dev);
status = -ETIMEDOUT; status = -ETIMEDOUT;
} }
@@ -568,6 +570,7 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap,
int i; int i;
u32 cause; u32 cause;
struct nmk_i2c_dev *dev = i2c_get_adapdata(i2c_adap); struct nmk_i2c_dev *dev = i2c_get_adapdata(i2c_adap);
u32 i2c_sr;
dev->busy = true; dev->busy = true;
@@ -607,14 +610,22 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap,
status = write_i2c(dev); status = write_i2c(dev);
} }
if (status || (dev->result)) { if (status || (dev->result)) {
/* get the abort cause */ i2c_sr = readl(dev->virtbase + I2C_SR);
cause = (readl(dev->virtbase + I2C_SR) >> 4) & 0x7; /*
dev_err(&dev->pdev->dev, "%s\n", * Check if the controller I2C operation status is set
cause >= ARRAY_SIZE(abort_causes) * to ABORT(11b).
? "unknown reason" : abort_causes[cause]); */
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; status = status ? status : dev->result;
goto out; goto out;
} }
udelay(I2C_DELAY); udelay(I2C_DELAY);