From mboxrd@z Thu Jan 1 00:00:00 1970 From: konrad.wilk@oracle.com (Konrad Rzeszutek Wilk) Date: Wed, 1 Aug 2012 10:52:58 -0400 Subject: [PATCH 21/24] arm/v2m: initialize arch_timers even if v2m_timer is not present In-Reply-To: <1343316846-25860-21-git-send-email-stefano.stabellini@eu.citrix.com> References: <1343316846-25860-21-git-send-email-stefano.stabellini@eu.citrix.com> Message-ID: <20120801145257.GQ7227@phenom.dumpdata.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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? > --- > 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755448Ab2HAPCY (ORCPT ); Wed, 1 Aug 2012 11:02:24 -0400 Received: from acsinet15.oracle.com ([141.146.126.227]:25207 "EHLO acsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755174Ab2HAPCX (ORCPT ); Wed, 1 Aug 2012 11:02:23 -0400 Date: Wed, 1 Aug 2012 10:52:58 -0400 From: Konrad Rzeszutek Wilk To: Stefano Stabellini Cc: linux-kernel@vger.kernel.org, xen-devel@lists.xensource.com, Ian.Campbell@citrix.com, 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 Message-ID: <20120801145257.GQ7227@phenom.dumpdata.com> References: <1343316846-25860-21-git-send-email-stefano.stabellini@eu.citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1343316846-25860-21-git-send-email-stefano.stabellini@eu.citrix.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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? > --- > 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: Re: [PATCH 21/24] arm/v2m: initialize arch_timers even if v2m_timer is not present Date: Wed, 1 Aug 2012 10:52:58 -0400 Message-ID: <20120801145257.GQ7227@phenom.dumpdata.com> References: <1343316846-25860-21-git-send-email-stefano.stabellini@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <1343316846-25860-21-git-send-email-stefano.stabellini-mvvWK6WmYclDPfheJLI6IQ@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linaro-dev-bounces-cunTk1MwBs8s++Sfvej+rw@public.gmane.org Errors-To: linaro-dev-bounces-cunTk1MwBs8s++Sfvej+rw@public.gmane.org To: Stefano Stabellini Cc: xen-devel-GuqFBffKawuULHF6PoxzQEEOCMrvLtNR@public.gmane.org, linaro-dev-cunTk1MwBs8s++Sfvej+rw@public.gmane.org, Ian.Campbell-Sxgqhf6Nn4DQT0dZR+AlfA@public.gmane.org, arnd-r2nGTMty4D4@public.gmane.org, catalin.marinas-5wv7dgnIgG8@public.gmane.org, tim-LM2mM/qkH7s@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org List-Id: xen-devel@lists.xenproject.org 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? > --- > 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