i2c: omap: cleanup the sysc write

Currently after the reset the sysc is written with hardcoded values.
The patch reads the sysc register and writes back the same value
after reset.

- Some unnecessary rev checks can be optimised.
- Also due to whatever reason the hwmod flags are changed
we will not reset the values.
- In some of the cases the minor values of the 2430 register
is different(0x37) in that case the autoidle setting may be missed.

Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 067a73922be3947df3aef838193f79a70709f39a..482c63d5368515f848ac1bb739d74a46c0f14932 100644 (file)
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -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;
 }