Date: Wed, 25 Sep 2013 08:37:19 -0700
From: =?utf-8?B?U8O2cmVu?= Brinkmann <soren.brinkmann@xilinx.com>
To: Daniel Lezcano <daniel.lezcano@linaro.org>
CC: Rob Herring <rob.herring@calxeda.com>, Pawel Moll <pawel.moll@arm.com>,
        Mark Rutland <mark.rutland@arm.com>,
        Stephen Warren <swarren@wwwdotorg.org>,
        Ian Campbell <ijc+devicetree@hellion.org.uk>,
        Russell King <linux@arm.linux.org.uk>,
        Michal Simek <michal.simek@xilinx.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Stephen Boyd <sboyd@codeaurora.org>,
        Grant Likely <grant.likely@secretlab.ca>,
        Preeti Murthy <preeti.lkml@gmail.com>, <devicetree@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH v2 0/4] arm: zynq: Enable global timer
References: <1379530118-22813-1-git-send-email-soren.brinkmann@xilinx.com>
 <5242FF4B.6050901@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Disposition: inline
In-Reply-To: <5242FF4B.6050901@linaro.org>
User-Agent: Mutt/1.5.21 (2010-09-15)
Message-ID: <06680eeb-11e3-4fdc-99f7-1b57c06deb11@CO1EHSMHS021.ehs.local>
Content-Transfer-Encoding: 8BIT
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 2369
Lines: 58

On Wed, Sep 25, 2013 at 05:20:43PM +0200, Daniel Lezcano wrote:
> On 09/18/2013 08:48 PM, Soren Brinkmann wrote:
> > Hi all,
> > 
> > here's a v2. I reused the subject from my v1 submission although the focus of
> > this series moved a bit towards the timer subsystem.
> > I replaced Stephen's fix to prevent per cpu devices from becoming
> > the broadcast device with Thomas' proposal, but I kept the original commit
> > message. I split the whole approach in small chunks that I found reasonable.
> > 
> > In 4/4, I picked up Grant's comment regarding the DT node name.
> > 
> > v2:
> >  - drop 1/2 of the original series
> >  - implement preventing per cpu devices from becoming broadcast device according
> >    to Thomas' proposal
> >    - introduce new CLOCK_EVT_FEAT_PERCPU flag
> >    - set the flag for the arm_global_timer
> >    - filter per cpu devices based on this flag when choosing the broadcast
> >      device
> >  - rename DT node to avoid '_'s
> >  
> > 
> > Soren Brinkmann (4):
> >   clockchips: Add FEAT_PERCPU clockevent flag
> >   clocksource/arm_global_timer: Set FEAT_PERCPU flag
> >   tick: broadcast: Deny per-cpu clockevents from being broadcast sources
> >   arm: zynq: Enable arm_global_timer
> > 
> >  arch/arm/boot/dts/zynq-7000.dtsi       | 8 ++++++++
> >  arch/arm/mach-zynq/Kconfig             | 1 +
> >  drivers/clocksource/arm_global_timer.c | 3 ++-
> >  include/linux/clockchips.h             | 1 +
> >  kernel/time/tick-broadcast.c           | 1 +
> >  5 files changed, 13 insertions(+), 1 deletion(-)
> 
> This patches falls under different maintainer's umbrella.
> 
> I acked-by the patches, so if someone is willing to take the patches I
> am ok with that. I am ok also to pick them into my tree with the
> acked-by maintainer. Just let me know ...

Thanks Daniel. I agree you/timer folks and Michal/armsoc have to figure
out how to resolve this the easiest way. I'd almost say merging this all
through the timers tree might be the easiest. The conflict which might
occur in the Zynq dts file should be trivial since the patch is purely
additive.

But well, up to you.

	Sören


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/