|
@@ -305,7 +305,11 @@ static void __omap_i2c_init(struct omap_i2c_dev *dev)
|
|
|
static int omap_i2c_reset(struct omap_i2c_dev *dev)
|
|
|
{
|
|
|
unsigned long timeout;
|
|
|
+ u16 sysc;
|
|
|
+
|
|
|
if (dev->rev >= OMAP_I2C_OMAP1_REV_2) {
|
|
|
+ sysc = omap_i2c_read_reg(dev, OMAP_I2C_SYSC_REG);
|
|
|
+
|
|
|
/* Disable I2C controller before soft reset */
|
|
|
omap_i2c_write_reg(dev, OMAP_I2C_CON_REG,
|
|
|
omap_i2c_read_reg(dev, OMAP_I2C_CON_REG) &
|
|
@@ -327,22 +331,8 @@ static int omap_i2c_reset(struct omap_i2c_dev *dev)
|
|
|
}
|
|
|
|
|
|
/* SYSC register is cleared by the reset; rewrite it */
|
|
|
- if (dev->rev == OMAP_I2C_REV_ON_2430) {
|
|
|
-
|
|
|
- omap_i2c_write_reg(dev, OMAP_I2C_SYSC_REG,
|
|
|
- SYSC_AUTOIDLE_MASK);
|
|
|
+ omap_i2c_write_reg(dev, OMAP_I2C_SYSC_REG, sysc);
|
|
|
|
|
|
- } else if (dev->rev >= OMAP_I2C_REV_ON_3430_3530) {
|
|
|
- dev->syscstate = SYSC_AUTOIDLE_MASK;
|
|
|
- dev->syscstate |= SYSC_ENAWAKEUP_MASK;
|
|
|
- dev->syscstate |= (SYSC_IDLEMODE_SMART <<
|
|
|
- __ffs(SYSC_SIDLEMODE_MASK));
|
|
|
- dev->syscstate |= (SYSC_CLOCKACTIVITY_FCLK <<
|
|
|
- __ffs(SYSC_CLOCKACTIVITY_MASK));
|
|
|
-
|
|
|
- omap_i2c_write_reg(dev, OMAP_I2C_SYSC_REG,
|
|
|
- dev->syscstate);
|
|
|
- }
|
|
|
}
|
|
|
return 0;
|
|
|
}
|