diff options
author | Rob Herring <rob.herring@calxeda.com> | 2013-02-06 22:18:31 -0500 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2013-04-11 16:11:18 -0400 |
commit | dabfd8fb84abfddf526123388b68a50ec14cd380 (patch) | |
tree | 64d87d90a1e02fa352ec12e87cea36fb2a6fe862 /arch/arm/mach-vexpress | |
parent | 5993b3ee98c6b1a86fc0f0a4bed12a1dd9f0eae5 (diff) |
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 <rob.herring@calxeda.com>
Acked-by: Pawel Moll <pawel.moll@arm.com>
Diffstat (limited to 'arch/arm/mach-vexpress')
-rw-r--r-- | arch/arm/mach-vexpress/v2m.c | 11 |
1 files changed, 0 insertions, 11 deletions
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) | |||
431 | 431 | ||
432 | static void __init v2m_dt_timer_init(void) | 432 | static void __init v2m_dt_timer_init(void) |
433 | { | 433 | { |
434 | struct device_node *node = NULL; | ||
435 | |||
436 | vexpress_clk_of_init(); | 434 | vexpress_clk_of_init(); |
437 | 435 | ||
438 | clocksource_of_init(); | 436 | clocksource_of_init(); |
439 | do { | ||
440 | node = of_find_compatible_node(node, NULL, "arm,sp804"); | ||
441 | } while (node && vexpress_get_site_by_node(node) != VEXPRESS_SITE_MB); | ||
442 | if (node) { | ||
443 | pr_info("Using SP804 '%s' as a clock & events source\n", | ||
444 | node->full_name); | ||
445 | v2m_sp804_init(of_iomap(node, 0), | ||
446 | irq_of_parse_and_map(node, 0)); | ||
447 | } | ||
448 | 437 | ||
449 | versatile_sched_clock_init(vexpress_get_24mhz_clock_base(), | 438 | versatile_sched_clock_init(vexpress_get_24mhz_clock_base(), |
450 | 24000000); | 439 | 24000000); |