diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2013-01-21 14:19:23 -0600 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2013-04-11 15:11:17 -0500 |
| commit | 5993b3ee98c6b1a86fc0f0a4bed12a1dd9f0eae5 (patch) | |
| tree | 07c049c9dd14360b3bc1dcaa970350c668af4f2c /arch | |
| parent | 7a0eca712118862a2ac25413b7ee24deb27808ea (diff) | |
ARM: highbank: use OF init for sp804 timer
Remove the highbank specific setup for the sp804 timer now that
clocksource_of_init will do it.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-highbank/highbank.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index 758150eb997..e7df2dd43a4 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c @@ -32,8 +32,6 @@ #include <asm/cacheflush.h> #include <asm/cputype.h> #include <asm/smp_plat.h> -#include <asm/hardware/arm_timer.h> -#include <asm/hardware/timer-sp.h> #include <asm/hardware/cache-l2x0.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> @@ -90,33 +88,16 @@ static void __init highbank_init_irq(void) #endif } -static struct clk_lookup lookup = { - .dev_id = "sp804", - .con_id = NULL, -}; - static void __init highbank_timer_init(void) { - int irq; struct device_node *np; - void __iomem *timer_base; /* Map system registers */ np = of_find_compatible_node(NULL, NULL, "calxeda,hb-sregs"); sregs_base = of_iomap(np, 0); WARN_ON(!sregs_base); - np = of_find_compatible_node(NULL, NULL, "arm,sp804"); - timer_base = of_iomap(np, 0); - WARN_ON(!timer_base); - irq = irq_of_parse_and_map(np, 0); - of_clk_init(NULL); - lookup.clk = of_clk_get(np, 0); - clkdev_add(&lookup); - - sp804_clocksource_and_sched_clock_init(timer_base + 0x20, "timer1"); - sp804_clockevents_init(timer_base, irq, "timer0"); clocksource_of_init(); } |