From: Stefano Stabellini Date: Wed, 1 Aug 2012 16:06:38 +0000 (+0000) Subject: arm/v2m: initialize arch_timers even if v2m_timer is not present X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ece46245f1e0ce03ac1265caeb0eefea100b0f94;p=people%2Fsstabellini%2Flinux-pvhvm-deprecated.git arm/v2m: initialize arch_timers even if v2m_timer is not present Signed-off-by: Stefano Stabellini CC: Russell King --- diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index fde26adaef3..dee1451993b 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 = {