lkml.org 
[lkml]   [2012]   [Aug]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 22/23] arm/v2m: initialize arch_timers even if v2m_timer is not present
    Date
    Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
    CC: Russell King <linux@arm.linux.org.uk>
    ---
    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


    \
     
     \ /
      Last update: 2012-08-06 17:41    [W:0.027 / U:0.096 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site