diff options
| author | Shubhrajyoti D <shubhrajyoti@ti.com> | 2011-08-03 13:58:08 +0530 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2011-10-29 09:37:09 +0100 |
| commit | cb28e5823588cc357865cc0eab2afeec90e1f057 (patch) | |
| tree | c39a8d4f57caaac228f6338310945641cdebd1ce /drivers | |
| parent | 9550d4d7ab9aff125d3f7d48d3e97c093d19bdbe (diff) | |
| download | linux-cb28e5823588cc357865cc0eab2afeec90e1f057.tar.gz linux-cb28e5823588cc357865cc0eab2afeec90e1f057.tar.bz2 linux-cb28e5823588cc357865cc0eab2afeec90e1f057.zip | |
OMAP4: I2C: Enable the wakeup in I2C_WE
Currently for OMAP4 the I2C_WE is not programmed.
This patch enables the programming for OMAP4.
This patch fixes a bad conflict resolution.
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@ti.com>
Reported-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | 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 642a233a6c84..5df938ff0e91 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -384,9 +384,8 @@ static int omap_i2c_init(struct omap_i2c_dev *dev) * REVISIT: Some wkup 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); |