1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index a64a192c44a..0037e31076b 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -286,6 +286,11 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
         unsigned long internal_clk = 0;
 
         if (dev->rev >= OMAP_I2C_REV_2) {
+                /* Disable I2C controller before soft reset */
+                omap_i2c_write_reg(dev, OMAP_I2C_CON_REG,
+                        omap_i2c_read_reg(dev, OMAP_I2C_CON_REG) &
+                                ~(OMAP_I2C_CON_EN));
+
                 omap_i2c_write_reg(dev, OMAP_I2C_SYSC_REG, SYSC_SOFTRESET_MASK);
                 /* For some reason we need to set the EN bit before the
                  * reset done bit gets set. */