[adding Ben Dooks, in the future, please be sure to put maintainers To/Cc] 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. > 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> > --- > TODO: > Currently all the wakeup sources are enabled. > There is scope of optimising the same. Will revisit it. > Rebased on for_3.1/i2c-andy Thanks, adding to my for_3.1/i2c-fixes queue for v3.1-rc. Ben, with your ack, I'm willing to queue these. Kevin -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
