From: Tony Lindgren <tony@atomide.com>
To: "Shilimkar, Santosh" <santosh.shilimkar@ti.com>
Cc: Benoit Cousson <b-cousson@ti.com>,
linux-omap@vger.kernel.org,
linux-arm-kernel@lists.infradead.orig
Subject: Re: [PATCH 2/2] ARM: OMAP5: Enable arch timer support
Date: Tue, 18 Sep 2012 10:53:07 -0700 [thread overview]
Message-ID: <20120918175307.GU11762@atomide.com> (raw)
In-Reply-To: <CAMQu2gzqvN3GZiEFZ7Xa+JeS4nz4HG4P4KDsNEoQxvdAhUc6qg@mail.gmail.com>
* Shilimkar, Santosh <santosh.shilimkar@ti.com> [120917 23:07]:
> On Tue, Sep 18, 2012 at 3:09 AM, Tony Lindgren <tony@atomide.com> wrote:
> >
> > * Tony Lindgren <tony@atomide.com> [120917 14:39]:
> > > * Benoit Cousson <b-cousson@ti.com> [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 <santosh.shilimkar@ti.com>
> > > >
> > > > Acked-by: Benoit Cousson <b-cousson@ti.com>
> > > >
> > > > 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?
It seems that Jon is still working on the fixes series, so let's
assume that will need to wait a bit.
Regards,
Tony
next prev parent reply other threads:[~2012-09-18 17:53 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-13 11:07 [PATCH 0/2] ARM: OMAP5: Enable local timer support Santosh Shilimkar
2012-08-13 11:07 ` [PATCH 1/2] ARM: OMAP: Add initialisation for the real-time counter Santosh Shilimkar
2012-08-13 17:35 ` Vaibhav Hiremath
2012-08-14 6:16 ` Shilimkar, Santosh
2012-08-14 6:22 ` Hiremath, Vaibhav
2012-08-17 8:47 ` Shilimkar, Santosh
2012-08-13 11:07 ` [PATCH 2/2] ARM: OMAP5: Enable arch timer support Santosh Shilimkar
2012-09-10 11:45 ` Shilimkar, Santosh
2012-09-10 12:47 ` Benoit Cousson
2012-09-10 13:01 ` Shilimkar, Santosh
2012-09-10 13:14 ` Benoit Cousson
2012-09-10 13:39 ` Shilimkar, Santosh
2012-09-11 9:29 ` Shilimkar, Santosh
2012-09-13 8:56 ` Benoit Cousson
2012-09-13 9:00 ` Shilimkar, Santosh
2012-09-13 9:27 ` Benoit Cousson
2012-09-13 10:00 ` Shilimkar, Santosh
2012-09-13 10:05 ` Shilimkar, Santosh
2012-09-17 21:38 ` Tony Lindgren
2012-09-17 21:39 ` Tony Lindgren
2012-09-18 6:06 ` Shilimkar, Santosh
2012-09-18 17:53 ` Tony Lindgren [this message]
2012-09-19 7:57 ` Shilimkar, Santosh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120918175307.GU11762@atomide.com \
--to=tony@atomide.com \
--cc=b-cousson@ti.com \
--cc=linux-arm-kernel@lists.infradead.orig \
--cc=linux-omap@vger.kernel.org \
--cc=santosh.shilimkar@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).