[PATCH 3/5] OMAP: I2C: Remove the reset in the init path

[T Krishnamoorthy, Balaji]

On Thu, Jul 21, 2011 at 12:23 PM, Shubhrajyoti D <shubhrajyoti at ti.com> wrote:
> The reset in the driver at init is not needed
> anymore as the hwmod framework takes care of
> reseting it.
>
> Signed-off-by: Shubhrajyoti D <shubhrajyoti at ti.com>
> ---
>  drivers/i2c/busses/i2c-omap.c |   57 +++++++++++------------------------------
>  1 files changed, 15 insertions(+), 42 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
> index 8f87a37..d6ea7de 100644
> --- a/drivers/i2c/busses/i2c-omap.c
> +++ b/drivers/i2c/busses/i2c-omap.c
> @@ -155,9 +155,6 @@ enum {
>  #define OMAP_I2C_SYSTEST_SDA_O         (1 << 0)        /* SDA line drive out */
>  #endif
>
> -/* OCP_SYSSTATUS bit definitions */
> -#define SYSS_RESETDONE_MASK            (1 << 0)
> -
>  /* OCP_SYSCONFIG bit definitions */
>  #define SYSC_CLOCKACTIVITY_MASK                (0x3 << 8)
>  #define SYSC_SIDLEMODE_MASK            (0x3 << 3)
> @@ -182,6 +179,8 @@ struct omap_i2c_dev {
>        u32                     latency;        /* maximum mpu wkup latency */
>        void                    (*set_mpu_wkup_lat)(struct device *dev,
>                                                    long latency);
> +       int                     (*device_reset)(struct device *dev);
> +
>        u32                     speed;          /* Speed of bus in Khz */
>        u16                     cmd_err;
>        u8                      *buf;
> @@ -332,7 +331,6 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
>        u16 psc = 0, scll = 0, sclh = 0, buf = 0;
>        u16 fsscll = 0, fssclh = 0, hsscll = 0, hssclh = 0;
>        unsigned long fclk_rate = 12000000;
> -       unsigned long timeout;
>        unsigned long internal_clk = 0;
>        struct clk *fclk;
>        struct platform_device *pdev;
> @@ -341,43 +339,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
>        pdev = to_platform_device(dev->dev);
>        pdata = pdev->dev.platform_data;
>
> -       if (dev->rev >= OMAP_I2C_OMAP1_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. */
> -               timeout = jiffies + OMAP_I2C_TIMEOUT;
> -               omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, OMAP_I2C_CON_EN);
> -               while (!(omap_i2c_read_reg(dev, OMAP_I2C_SYSS_REG) &
> -                        SYSS_RESETDONE_MASK)) {
> -                       if (time_after(jiffies, timeout)) {
> -                               dev_warn(dev->dev, "timeout waiting "
> -                                               "for controller reset\n");
> -                               return -ETIMEDOUT;
> -                       }
> -                       msleep(1);
> -               }
> -
> -               /* 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);
> -
> -               } else if (dev->rev >= OMAP_I2C_REV_ON_3430) {
> -                       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);
> +       if (dev->rev >= OMAP_I2C_REV_ON_3430) {
>                        /*
>                         * Enabling all wakup sources to stop I2C freezing on
>                         * WFI instruction.

one extra level of indentation

> @@ -388,7 +350,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
>                                omap_i2c_write_reg(dev, OMAP_I2C_WE_REG,
>                                                                dev->westate);
>                }

same

> -       }
> +

spurious change, This comment applies to other patches in the series.

>        omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
>
>        if (pdata->flags & OMAP_I2C_FLAG_ALWAYS_ARMXOR_CLK) {