From mboxrd@z Thu Jan 1 00:00:00 1970 From: pawel.moll@arm.com (Pawel Moll) Date: Fri, 14 Sep 2012 13:27:08 +0100 Subject: [PATCH v4 21/24] arm/v2m: initialize arch_timers even if v2m_timer is not present In-Reply-To: <1347621207-11294-21-git-send-email-stefano.stabellini@eu.citrix.com> References: <1347621207-11294-21-git-send-email-stefano.stabellini@eu.citrix.com> Message-ID: <1347625628.2497.65.camel@hornet> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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(-) > > diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/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) > > v2m_clk_init(); > > - err = of_property_read_string(of_aliases, "arm,v2m_timer", &path); > - if (WARN_ON(err)) > - return; > - node = 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() != 0) > twd_local_timer_of_register(); > > if (arch_timer_sched_clock_init() != 0) > versatile_sched_clock_init(v2m_sysreg_base + V2M_SYS_24MHZ, 24000000); > + > + err = of_property_read_string(of_aliases, "arm,v2m_timer", &path); > + if (WARN_ON(err)) > + return; > + node = of_find_node_by_path(path); > + v2m_sp804_init(of_iomap(node, 0), irq_of_parse_and_map(node, 0)); > } > > static struct sys_timer v2m_dt_timer = { 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. Cheers! Pawe?