diff options
author | Rob Herring <rob.herring@calxeda.com> | 2013-01-21 15:19:23 -0500 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2013-04-11 16:11:17 -0400 |
commit | 5993b3ee98c6b1a86fc0f0a4bed12a1dd9f0eae5 (patch) | |
tree | 07c049c9dd14360b3bc1dcaa970350c668af4f2c /arch/arm/mach-highbank | |
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/arm/mach-highbank')
-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 758150eb9975..e7df2dd43a40 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c | |||
@@ -32,8 +32,6 @@ | |||
32 | #include <asm/cacheflush.h> | 32 | #include <asm/cacheflush.h> |
33 | #include <asm/cputype.h> | 33 | #include <asm/cputype.h> |
34 | #include <asm/smp_plat.h> | 34 | #include <asm/smp_plat.h> |
35 | #include <asm/hardware/arm_timer.h> | ||
36 | #include <asm/hardware/timer-sp.h> | ||
37 | #include <asm/hardware/cache-l2x0.h> | 35 | #include <asm/hardware/cache-l2x0.h> |
38 | #include <asm/mach/arch.h> | 36 | #include <asm/mach/arch.h> |
39 | #include <asm/mach/map.h> | 37 | #include <asm/mach/map.h> |
@@ -90,33 +88,16 @@ static void __init highbank_init_irq(void) | |||
90 | #endif | 88 | #endif |
91 | } | 89 | } |
92 | 90 | ||
93 | static struct clk_lookup lookup = { | ||
94 | .dev_id = "sp804", | ||
95 | .con_id = NULL, | ||
96 | }; | ||
97 | |||
98 | static void __init highbank_timer_init(void) | 91 | static void __init highbank_timer_init(void) |
99 | { | 92 | { |
100 | int irq; | ||
101 | struct device_node *np; | 93 | struct device_node *np; |
102 | void __iomem *timer_base; | ||
103 | 94 | ||
104 | /* Map system registers */ | 95 | /* Map system registers */ |
105 | np = of_find_compatible_node(NULL, NULL, "calxeda,hb-sregs"); | 96 | np = of_find_compatible_node(NULL, NULL, "calxeda,hb-sregs"); |
106 | sregs_base = of_iomap(np, 0); | 97 | sregs_base = of_iomap(np, 0); |
107 | WARN_ON(!sregs_base); | 98 | WARN_ON(!sregs_base); |
108 | 99 | ||
109 | np = of_find_compatible_node(NULL, NULL, "arm,sp804"); | ||
110 | timer_base = of_iomap(np, 0); | ||
111 | WARN_ON(!timer_base); | ||
112 | irq = irq_of_parse_and_map(np, 0); | ||
113 | |||
114 | of_clk_init(NULL); | 100 | of_clk_init(NULL); |
115 | lookup.clk = of_clk_get(np, 0); | ||
116 | clkdev_add(&lookup); | ||
117 | |||
118 | sp804_clocksource_and_sched_clock_init(timer_base + 0x20, "timer1"); | ||
119 | sp804_clockevents_init(timer_base, irq, "timer0"); | ||
120 | 101 | ||
121 | clocksource_of_init(); | 102 | clocksource_of_init(); |
122 | } | 103 | } |