From: Rob Herring Date: Thu, 7 Feb 2013 03:18:31 +0000 (-0600) Subject: ARM: vexpress: remove sp804 OF init X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dabfd8fb84abfddf526123388b68a50ec14cd380;p=linux-beck.git ARM: vexpress: remove sp804 OF init Remove the vexpress specific setup for the sp804 timer now that clocksource_of_init will do it. Signed-off-by: Rob Herring Acked-by: Pawel Moll --- diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index 621571781b20..cdc29d895ab0 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c @@ -431,20 +431,9 @@ void __init v2m_dt_init_early(void) static void __init v2m_dt_timer_init(void) { - struct device_node *node = NULL; - vexpress_clk_of_init(); clocksource_of_init(); - do { - node = of_find_compatible_node(node, NULL, "arm,sp804"); - } while (node && vexpress_get_site_by_node(node) != VEXPRESS_SITE_MB); - if (node) { - pr_info("Using SP804 '%s' as a clock & events source\n", - node->full_name); - v2m_sp804_init(of_iomap(node, 0), - irq_of_parse_and_map(node, 0)); - } versatile_sched_clock_init(vexpress_get_24mhz_clock_base(), 24000000);