diff options
| -rw-r--r-- | drivers/i2c/busses/i2c-tegra.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index 2597db6a0c37..2c795592f80e 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -479,10 +479,6 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev) tegra_i2c_clock_enable(i2c_dev); - /* Interrupt generated before sending stop signal so - * wait for some time so that stop signal can be send proerly */ - mdelay(1); - tegra_periph_reset_assert(i2c_dev->div_clk); udelay(2); tegra_periph_reset_deassert(i2c_dev->div_clk); @@ -760,6 +756,14 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_bus *i2c_bus, } } + /* + * 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->last_bus_clk_rate)); + tegra_i2c_init(i2c_dev); if (i2c_dev->msg_err == I2C_ERR_NO_ACK) { |