From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753329Ab2HAQHN (ORCPT ); Wed, 1 Aug 2012 12:07:13 -0400 Received: from smtp.eu.citrix.com ([62.200.22.115]:27036 "EHLO SMTP.EU.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751241Ab2HAQHL (ORCPT ); Wed, 1 Aug 2012 12:07:11 -0400 X-IronPort-AV: E=Sophos;i="4.77,694,1336348800"; d="scan'208";a="13807760" Date: Wed, 1 Aug 2012 17:06:42 +0100 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Konrad Rzeszutek Wilk CC: Stefano Stabellini , "linux-kernel@vger.kernel.org" , "xen-devel@lists.xensource.com" , Ian Campbell , "Tim (Xen.org)" , "linux-arm-kernel@lists.infradead.org" , "linaro-dev@lists.linaro.org" , "catalin.marinas@arm.com" , "arnd@arndb.de" Subject: Re: [PATCH 21/24] arm/v2m: initialize arch_timers even if v2m_timer is not present In-Reply-To: <20120801145257.GQ7227@phenom.dumpdata.com> Message-ID: References: <1343316846-25860-21-git-send-email-stefano.stabellini@eu.citrix.com> <20120801145257.GQ7227@phenom.dumpdata.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 1 Aug 2012, Konrad Rzeszutek Wilk wrote: > On Thu, Jul 26, 2012 at 04:34:03PM +0100, Stefano Stabellini wrote: > > Signed-off-by: Stefano Stabellini > > Should the maintainer of the v2m be CC-ed here? > This looks like a bug-fix of itself? I think so. I'll CC Russell King next time. > > --- > > 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 fde26ad..dee1451 100644 > > --- a/arch/arm/mach-vexpress/v2m.c > > +++ b/arch/arm/mach-vexpress/v2m.c > > @@ -637,16 +637,17 @@ static void __init v2m_dt_timer_init(void) > > node = of_find_compatible_node(NULL, NULL, "arm,sp810"); > > v2m_sysctl_init(of_iomap(node, 0)); > > > > - 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 = { > > -- > > 1.7.2.5 >