diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-05-14 02:19:22 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-05-14 02:19:22 +0200 |
| commit | 8b6ee04067310a6397476f05f06e52dabd8b0bb6 (patch) | |
| tree | 022a153b777a9e38f49d46e4fb8f1e6747d4a5f4 /drivers/i2c/busses/i2c-tegra.c | |
| parent | Merge remote-tracking branch 'jwb/next' into next (diff) | |
| parent | powerpc/irq: Fix another case of lazy IRQ state getting out of sync (diff) | |
| download | linux-8b6ee04067310a6397476f05f06e52dabd8b0bb6.tar.xz linux-8b6ee04067310a6397476f05f06e52dabd8b0bb6.zip | |
Merge branch 'merge' into next
We want the irq fixes from the "merge" branch.
Diffstat (limited to 'drivers/i2c/busses/i2c-tegra.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-tegra.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index e978635e60f0..55e5ea62ccee 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -516,6 +516,14 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, if (likely(i2c_dev->msg_err == I2C_ERR_NONE)) return 0; + /* + * NACK interrupt is generated before the I2C controller generates the + * STOP condition on the bus. So wait for 2 clock periods before resetting + * the controller so that STOP condition has been delivered properly. + */ + if (i2c_dev->msg_err == I2C_ERR_NO_ACK) + udelay(DIV_ROUND_UP(2 * 1000000, i2c_dev->bus_clk_rate)); + tegra_i2c_init(i2c_dev); if (i2c_dev->msg_err == I2C_ERR_NO_ACK) { if (msg->flags & I2C_M_IGNORE_NAK) |