OMAP4: I2C: Enable the wakeup in I2C_WE
authorShubhrajyoti D <shubhrajyoti@ti.com>
Wed, 3 Aug 2011 08:28:08 +0000 (13:58 +0530)
committerBen Dooks <ben-linux@fluff.org>
Sat, 29 Oct 2011 08:37:09 +0000 (09:37 +0100)
commitcb28e5823588cc357865cc0eab2afeec90e1f057
treec39a8d4f57caaac228f6338310945641cdebd1ce
parent9550d4d7ab9aff125d3f7d48d3e97c093d19bdbe
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>
drivers/i2c/busses/i2c-omap.c