On Tue, Sep 18, 2012 at 11:23 PM, Tony Lindgren <[email protected]> wrote: > * Shilimkar, Santosh <[email protected]> [120917 23:07]: >> On Tue, Sep 18, 2012 at 3:09 AM, Tony Lindgren <[email protected]> wrote: >> > >> > * Tony Lindgren <[email protected]> [120917 14:39]: >> > > * Benoit Cousson <[email protected]> [120913 01:57]: >> > > > > >> > > > > Enable Cortex A15 generic timer support for OMAP5 based SOCs. >> > > > > The CPU local timers run on the free running real time counter >> > > > > clock. >> > > > > >> > > > > Signed-off-by: Santosh Shilimkar <[email protected]> >> > > > >> > > > Acked-by: Benoit Cousson <[email protected]> >> > > > >> > > > Tony, >> > > > >> > > > I can potentially add it along with the timer changes in the dts part2 >> > > > series if you ack the timer patch. We don't have tons of OMAP5 content >> > > > in the dts branch so it should not conflict. >> > > >> > > Yes makes sense to me. >> > >> > These may cause bad merge conflicts with Jon's timer patches though? >> > >> These patches can be applied against any branch so not necessary to >> only apply against the DT tree. >> >> Have you merged Jon's series ? I can refresh the patches >> against that branch. Another option is I can split the patch >> so that DT change and timer change is seperated. >> >> Let me know what is your preference. > > Maybe do a pull request for the arch timer and dtimer DT changes? > Just sent.
> It seems that Jon is still working on the fixes series, so let's > assume that will need to wait a bit. > Ok. Thanks for clarification. Regards Santosh -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
