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 /README | |
| parent | 9550d4d7ab9aff125d3f7d48d3e97c093d19bdbe (diff) | |
| download | op-kernel-dev-cb28e5823588cc357865cc0eab2afeec90e1f057.zip op-kernel-dev-cb28e5823588cc357865cc0eab2afeec90e1f057.tar.gz | |
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 'README')
0 files changed, 0 insertions, 0 deletions
