diff options
author | Taras Kondratiuk <taras.kondratiuk@linaro.org> | 2013-10-07 13:41:59 +0300 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2013-10-10 10:22:32 +0200 |
commit | 4cdbf7d346e7461c3b93a26707c852e2c9db3753 (patch) | |
tree | dd709f5e5804745d61e459519a20b31ffcba51f0 | |
parent | 47b6e477ed4ecacddd1f82d04d686026e08dc3db (diff) | |
download | linux-stable-4cdbf7d346e7461c3b93a26707c852e2c9db3753.tar.gz linux-stable-4cdbf7d346e7461c3b93a26707c852e2c9db3753.tar.bz2 linux-stable-4cdbf7d346e7461c3b93a26707c852e2c9db3753.zip |
i2c: omap: Clear ARDY bit twice
Initially commit cb527ede1bf6ff2008a025606f25344b8ed7b4ac
"i2c-omap: Double clear of ARDY status in IRQ handler"
added a workaround for undocumented errata ProDB0017052.
But then commit 1d7afc95946487945cc7f5019b41255b72224b70
"i2c: omap: ack IRQ in parts" refactored code and missed
one of ARDY clearings. So current code violates errata.
It causes often i2c bus timeouts on my Pandaboard.
This patch adds a second clearing in place.
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Taras Kondratiuk <taras.kondratiuk@linaro.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Cc: stable@kernel.org
-rw-r--r-- | drivers/i2c/busses/i2c-omap.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 6d8308d5dc4e..9967a6f9c2ff 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -939,6 +939,9 @@ omap_i2c_isr_thread(int this_irq, void *dev_id) /* * ProDB0017052: Clear ARDY bit twice */ + if (stat & OMAP_I2C_STAT_ARDY) + omap_i2c_ack_stat(dev, OMAP_I2C_STAT_ARDY); + if (stat & (OMAP_I2C_STAT_ARDY | OMAP_I2C_STAT_NACK | OMAP_I2C_STAT_AL)) { omap_i2c_ack_stat(dev, (OMAP_I2C_STAT_RRDY | |