diff options
| author | Taras Kondratiuk <taras.kondratiuk@linaro.org> | 2013-10-07 06:41:59 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-18 10:45:44 -0400 |
| commit | fafd39123416e56bf782e323031e6fdd18b61d60 (patch) | |
| tree | c36d3961a013aeef68c0e81f6f46d42f220506f7 | |
| parent | 670c0d101a57340aff4311c26a9ebb65b1d58f5a (diff) | |
i2c: omap: Clear ARDY bit twice
commit 4cdbf7d346e7461c3b93a26707c852e2c9db3753 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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 e02f9e36a7b2..b06be8e3bb76 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c | |||
| @@ -941,6 +941,9 @@ omap_i2c_isr_thread(int this_irq, void *dev_id) | |||
| 941 | /* | 941 | /* |
| 942 | * ProDB0017052: Clear ARDY bit twice | 942 | * ProDB0017052: Clear ARDY bit twice |
| 943 | */ | 943 | */ |
| 944 | if (stat & OMAP_I2C_STAT_ARDY) | ||
| 945 | omap_i2c_ack_stat(dev, OMAP_I2C_STAT_ARDY); | ||
| 946 | |||
| 944 | if (stat & (OMAP_I2C_STAT_ARDY | OMAP_I2C_STAT_NACK | | 947 | if (stat & (OMAP_I2C_STAT_ARDY | OMAP_I2C_STAT_NACK | |
| 945 | OMAP_I2C_STAT_AL)) { | 948 | OMAP_I2C_STAT_AL)) { |
| 946 | omap_i2c_ack_stat(dev, (OMAP_I2C_STAT_RRDY | | 949 | omap_i2c_ack_stat(dev, (OMAP_I2C_STAT_RRDY | |