[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.DEB.2.02.1208011705100.4645@kaball.uk.xensource.com>
Date: Wed, 1 Aug 2012 17:06:42 +0100
From: Stefano Stabellini <stefano.stabellini@...citrix.com>
To: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
CC: Stefano Stabellini <Stefano.Stabellini@...citrix.com>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"xen-devel@...ts.xensource.com" <xen-devel@...ts.xensource.com>,
Ian Campbell <Ian.Campbell@...rix.com>,
"Tim (Xen.org)" <tim@....org>,
"linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>,
"linaro-dev@...ts.linaro.org" <linaro-dev@...ts.linaro.org>,
"catalin.marinas@....com" <catalin.marinas@....com>,
"arnd@...db.de" <arnd@...db.de>
Subject: Re: [PATCH 21/24] arm/v2m: initialize arch_timers even if v2m_timer
is not present
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 <stefano.stabellini@...citrix.com>
>
> 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
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists