From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751888Ab2INM1Q (ORCPT ); Fri, 14 Sep 2012 08:27:16 -0400 Received: from service87.mimecast.com ([91.220.42.44]:43939 "EHLO service87.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750750Ab2INM1O convert rfc822-to-8bit (ORCPT ); Fri, 14 Sep 2012 08:27:14 -0400 Message-ID: <1347625628.2497.65.camel@hornet> Subject: Re: [PATCH v4 21/24] arm/v2m: initialize arch_timers even if v2m_timer is not present From: Pawel Moll 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@citrix.com" , "konrad.wilk@oracle.com" , "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , Marc Zyngier Date: Fri, 14 Sep 2012 13:27:08 +0100 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> X-Mailer: Evolution 3.2.3-0ubuntu6 Mime-Version: 1.0 X-OriginalArrivalTime: 14 Sep 2012 12:27:08.0448 (UTC) FILETIME=[41FB9200:01CD9274] X-MC-Unique: 112091413271102001 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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ł