On Tuesday 10 January 2012 08:56 PM, Kevin Hilman wrote: > "Datta, Shubhrajyoti" <shubhrajyoti@xxxxxx> writes: > >> On Tue, Jan 10, 2012 at 11:53 AM, Datta, Shubhrajyoti >> <shubhrajyoti@xxxxxx> wrote: >>> >>> >>> On Fri, Dec 16, 2011 at 2:29 PM, Shubhrajyoti <shubhrajyoti@xxxxxx> wrote: >>>> Ben, >>>> >>>> On Friday 16 December 2011 02:10 PM, Paul Walmsley wrote: >>>>> Hi >>>>> >>>>> On Tue, 13 Dec 2011, Shubhrajyoti D wrote: >>>>> >>>>>> - The reset in the driver at init is not needed anymore as the >>>>>> hwmod framework takes care of reseting it. >>>>>> - Reset is removed from omap_i2c_init, which was called >>>>>> not only during probe, but also after time out and error handling. >>>>>> device_reset were added in those places to effect the reset. >>>>>> - Earlier the hwmod SYSC settings were over-written in the driver. >>>>>> Removing the same and letting the hwmod take care of the settings. >>>>>> - Clean up the SYSS_RESETDONE_MASK macro as it is no longer needed. >>>>>> - Clean up the SYSCONFIG SYSC bit definition macros. >>>>>> - Fix the typos in wakeup. >>>>>> >>>>>> Signed-off-by: Shubhrajyoti D <shubhrajyoti@xxxxxx> >>>>>> --- >>>>>> drivers/i2c/busses/i2c-omap.c | 83 +++++++++++----------------------------- >>>>>> 1 files changed, 23 insertions(+), 60 deletions(-) >>>>> This patch either needs to be acked by Ben with a note that it's okay for >>>>> us to merge through the OMAP tree, or needs to be merged by Ben during the >>>>> 3.4 merge window, after patches 1-3 have reached the mainline tree. >>>> I agree. >>>> Ben do you have any comments . >>> >> If there are no further comments can this be merged also ? > As Benoit mentioned earlier, the addition of new pdata fields will cause > problems with the DT support already queued for v3.3. > > This series should be reworked on top of the DT support which Ben has > now queued for v3.3 (my branch: for_3.3/i2c/misc) Yes will rework it. > Kevin -- 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