From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pawel Moll Subject: Re: [PATCH v4 21/24] arm/v2m: initialize arch_timers even if v2m_timer is not present Date: Fri, 14 Sep 2012 14:03:39 +0100 Message-ID: <1347627819.2497.68.camel@hornet> References: <1347621207-11294-21-git-send-email-stefano.stabellini@eu.citrix.com> <1347625628.2497.65.camel@hornet> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org To: Stefano Stabellini Cc: "arnd@arndb.de" , "linux@arm.linux.org.uk" , Catalin Marinas , "linaro-dev@lists.linaro.org" , "linux-arm-kernel@lists.infradead.org" , "Tim (Xen.org)" , Ian Campbell , "konrad.wilk@oracle.com" , "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , Marc Zyngier List-Id: xen-devel@lists.xenproject.org On Fri, 2012-09-14 at 13:48 +0100, Stefano Stabellini wrote: > On Fri, 14 Sep 2012, Pawel Moll wrote: > > On Fri, 2012-09-14 at 12:13 +0100, Stefano Stabellini wrote: > > > Signed-off-by: Stefano Stabellini > > > CC: Russell King > > > CC: Pawel Moll > > > CC: Marc Zyngier > > > --- > > > arch/arm/mach-vexpress/v2m.c | 11 ++++++----- > > > 1 files changed, 6 insertions(+), 5 deletions(-) > > >=20 > > > diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpres= s/v2m.c > > > index 37608f2..4e567f7 100644 > > > --- a/arch/arm/mach-vexpress/v2m.c > > > +++ b/arch/arm/mach-vexpress/v2m.c > > > @@ -621,16 +621,17 @@ static void __init v2m_dt_timer_init(void) > > > =20 > > > v2m_clk_init(); > > > =20 > > > - err =3D of_property_read_string(of_aliases, "arm,v2m_timer", &p= ath); > > > - if (WARN_ON(err)) > > > - return; > > > - node =3D of_find_node_by_path(path); > > > - v2m_sp804_init(of_iomap(node, 0), irq_of_parse_and_map(node, 0)= ); > > > if (arch_timer_of_register() !=3D 0) > > > twd_local_timer_of_register(); > > > =20 > > > if (arch_timer_sched_clock_init() !=3D 0) > > > versatile_sched_clock_init(v2m_sysreg_base + V2M_SYS_24MHZ, 24= 000000); > > > + > > > + err =3D of_property_read_string(of_aliases, "arm,v2m_timer", &p= ath); > > > + if (WARN_ON(err)) > > > + return; > > > + node =3D of_find_node_by_path(path); > > > + v2m_sp804_init(of_iomap(node, 0), irq_of_parse_and_map(node, 0)= ); > > > } > > > =20 > > > static struct sys_timer v2m_dt_timer =3D { > >=20 > > Fair point. The alias is going to disappear anyway (I'm working on = a VE > > platform rework right now), but in case I won't get it on time for = 3.7, > > I'll make sure this one is merged instead. >=20 > Great, thanks! > Should I leave this patch out of the Xen on ARM series for 3.7 then? Em, I think so - it would conflict with my changes if they go in. Eithe= r way you'll have the problem sorted in 3.7. Pawe=C5=82