lkml.org 
[lkml]   [2012]   [Sep]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH v4 21/24] arm/v2m: initialize arch_timers even if v2m_timer is not present
    From
    Date
    On Fri, 2012-09-14 at 13:48 +0100, Stefano Stabellini wrote:
    > On Fri, 14 Sep 2012, Pawel Moll wrote:
    > > On Fri, 2012-09-14 at 12:13 +0100, Stefano Stabellini wrote:
    > > > Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
    > > > CC: Russell King <linux@arm.linux.org.uk>
    > > > CC: Pawel Moll <pawel.moll@arm.com>
    > > > CC: Marc Zyngier <marc.zyngier@arm.com>
    > > > ---
    > > > 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.
    >
    > Great, thanks!
    > Should I leave this patch out of the Xen on ARM series for 3.7 then?

    Em, I think so - it would conflict with my changes if they go in. Either
    way you'll have the problem sorted in 3.7.

    Paweł


    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2012-09-14 15:41    [W:3.437 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site