Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4cdbf7d346e7461c3b93a26707c852e2c9db3753

Authored by Taras Kondratiuk
Committed by Wolfram Sang
1 parent 47b6e477ed
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

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

Showing 1 changed file with 3 additions and 0 deletions Side-by-side Diff

drivers/i2c/busses/i2c-omap.c
Diff comments   View file @ 4cdbf7d
... ... @@ -939,6 +939,9 @@
939 939 /*
940 940 * ProDB0017052: Clear ARDY bit twice
941 941 */
  942 + if (stat & OMAP_I2C_STAT_ARDY)
  943 + omap_i2c_ack_stat(dev, OMAP_I2C_STAT_ARDY);
  944 +
942 945 if (stat & (OMAP_I2C_STAT_ARDY | OMAP_I2C_STAT_NACK |
943 946 OMAP_I2C_STAT_AL)) {
944 947 omap_i2c_ack_stat(dev, (OMAP_I2C_STAT_RRDY |