Shubhrajyoti D <shubhrajyoti@xxxxxx> writes: > Currently for OMAP4 the I2C_WE is not programmed. > This patch enables the programming for OMAP4. > > This patch fixes a bad conflict resolution. ...by me I guess, sorry about that. > This effectively restores the following commit > > Commit 120bdaa47[i2c-omap: Program I2C_WE on OMAP4 to enable i2c wakeup] > > which got changed by > > Commit a3a7acbc[I2C: OMAP2+: address confused probed version naming] > > Reviewed-by: Felipe Balbi <balbi@xxxxxx> > Reported-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx> > Signed-off-by: Shubhrajyoti D <shubhrajyoti@xxxxxx> Thanks, adding to my wip/i2c branch. I'll shortly be breaking that branch up into fixes for v3.1 (like this one) and stuff proposed for 3.2. The branch names will be something like for_3.1/i2c-fixes and for_3.2/i2c Kevin > --- > TODO: > Currently all the wakeup sources are enabled. > There is scope of optimising the same. Will revisit it. > Rebased on Kevin's wip/i2c branch > Tested on OMAP4430. > > drivers/i2c/busses/i2c-omap.c | 5 ++--- > 1 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c > index d05efe7..18cc0af 100644 > --- a/drivers/i2c/busses/i2c-omap.c > +++ b/drivers/i2c/busses/i2c-omap.c > @@ -313,9 +313,8 @@ static int omap_i2c_init(struct omap_i2c_dev *dev) > * REVISIT: Some wakeup sources might not be needed. > */ > dev->westate = OMAP_I2C_WE_ALL; > - if (dev->rev < OMAP_I2C_REV_ON_3530_4430) > - omap_i2c_write_reg(dev, OMAP_I2C_WE_REG, > - dev->westate); > + omap_i2c_write_reg(dev, OMAP_I2C_WE_REG, > + dev->westate); > } > omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0); -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
