From: olof@lixom•net (Olof Johansson)
To: linux-arm-kernel@lists•infradead.org
Subject: [GIT PULL] Timer clean-ups for 3.10, Part 2
Date: Tue, 16 Apr 2013 12:24:01 -0700 [thread overview]
Message-ID: <20130416192401.GA8730@quad.lixom.net> (raw)
In-Reply-To: <516C0257.8040103@gmail.com>
On Mon, Apr 15, 2013 at 08:36:23AM -0500, Rob Herring wrote:
> On 04/13/2013 01:50 AM, Olof Johansson wrote:
> > On Thu, Apr 11, 2013 at 10:57:07PM +0200, Arnd Bergmann wrote:
> >> On Thursday 11 April 2013, Rob Herring wrote:
> >>> Olof, Arnd,
> >>>
> >>> Please pull timer clean-ups for arch timer, sp804, and integrator-cp timers.
> >>>
> >>> I've dropped the final patch which moved the sp804 and integrator timers
> >>> code to drivers/clocksource until the desired structure is worked out.
> >>>
> >>> Simon, the fixes for shmobile were trivial. Please comment if you see
> >>> any issues.
> >>
> >> Ok, nice!
> >>
> >> There are various bits for which I'd like to see Russell's ACK before
> >> we send them Linuswards, but it all looks good to me.
> >>
> >> I would put it into arm-soc tomorrow, and hopefully Haojian Zhuang is
> >> able to send an updated version of his hisilicon platform code based
> >> on top of this in time for the merge window. The patches are all
> >> reviewed but just waiting for the sp804 changes now, and since
> >> it's a new platform, I'm not worried about regressions.
> >
> > I've pulled this in as a late/clksrc branch now, so that we keep it separate
> > from the other work in case Russell ends up having comments on it when he is
> > back online.
> >
> > Also, I based the branch on samsung/mct and samsung/clk, since they had merge
> > conflicts. Kukjin, Rob, please confirm that I've resolved them properly.
>
> It is quite messed up because the mct timer changes are not based on
> arm-soc/clksrc/cleanup. Any timer changes adding CLKSRC_OF support need
> to be based on this. I've fixed it up in this branch (untested):
>
> git://sources.calxeda.com/kernel/linux.git exynos-mct-merge
>
> I merged with clksrc-cleanup-for-3.10-part2 and fixed it in the merge,
> but really either the mct branch should be rebased or some of the
> changes can be a preparatory commit before merging.
Sigh. I'd like to just drop the Exynos MCT patches, but they're now a bit down
into the next/drivers branch with various dependencies into later branches too.
Given that things are already broken, I'll just fix this up in an incremental
patch on top of the late/clksrc branch for now.
> Also, I really don't like how intermingled the DT and non-DT init is in
> the exynos code. We should remove of_have_populated_dt so we don't have
> stuff like this:
Agreed. Hopefully we can remove the non-DT code when Exynos is going DT-only.
> I went thru arm-soc/for-next and all the other conversions not done by
> me (mxs, sirf, zynq) are based on clksrc/cleanup.
Good.
-Olof
next prev parent reply other threads:[~2013-04-16 19:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-11 20:44 [GIT PULL] Timer clean-ups for 3.10, Part 2 Rob Herring
2013-04-11 20:57 ` Arnd Bergmann
2013-04-12 1:33 ` Haojian Zhuang
2013-04-13 6:50 ` Olof Johansson
2013-04-15 13:36 ` Rob Herring
2013-04-15 21:20 ` Arnd Bergmann
2013-04-17 16:57 ` Olof Johansson
2013-04-17 18:48 ` Olof Johansson
2013-04-19 10:52 ` Kukjin Kim
2013-04-16 19:24 ` Olof Johansson [this message]
2013-04-17 0:27 ` Stephen Boyd
2013-04-17 13:40 ` Rob Herring
2013-04-17 18:22 ` Stephen Boyd
2013-04-17 23:18 ` Rob Herring
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=20130416192401.GA8730@quad.lixom.net \
--to=olof@lixom$(echo .)net \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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