diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-04-23 10:04:14 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-19 11:54:37 -0400 |
commit | 9682bcdef1a9a0af940c30250ede697e7e70ef28 (patch) | |
tree | 456bfacae03149e9feeb3542d46c6f0681ef951c /drivers/clocksource | |
parent | a857c6e7d5fda19c39674a61d9f360bc43a7dcf6 (diff) |
clocksource: kona: adapt to CLOCKSOURCE_OF_DECLARE change
The CLOCKSOURCE_OF_DECLARE functions now take a device_node pointer
as their argument, as of the clksrc/cleanup branch in arm-soc.
This patch adapts the bcm_kona_timer driver to the new interface.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Christian Daudt <csd@broadcom.com>
Cc: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r-- | drivers/clocksource/bcm_kona_timer.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/clocksource/bcm_kona_timer.c b/drivers/clocksource/bcm_kona_timer.c index 350f49356458..ba3d85904c9a 100644 --- a/drivers/clocksource/bcm_kona_timer.c +++ b/drivers/clocksource/bcm_kona_timer.c | |||
@@ -103,16 +103,10 @@ static const struct of_device_id bcm_timer_ids[] __initconst = { | |||
103 | {}, | 103 | {}, |
104 | }; | 104 | }; |
105 | 105 | ||
106 | static void __init kona_timers_init(void) | 106 | static void __init kona_timers_init(struct device_node *node) |
107 | { | 107 | { |
108 | struct device_node *node; | ||
109 | u32 freq; | 108 | u32 freq; |
110 | 109 | ||
111 | node = of_find_matching_node(NULL, bcm_timer_ids); | ||
112 | |||
113 | if (!node) | ||
114 | panic("No timer"); | ||
115 | |||
116 | if (!of_property_read_u32(node, "clock-frequency", &freq)) | 110 | if (!of_property_read_u32(node, "clock-frequency", &freq)) |
117 | arch_timer_rate = freq; | 111 | arch_timer_rate = freq; |
118 | else | 112 | else |
@@ -199,13 +193,12 @@ static struct irqaction kona_timer_irq = { | |||
199 | .handler = kona_timer_interrupt, | 193 | .handler = kona_timer_interrupt, |
200 | }; | 194 | }; |
201 | 195 | ||
202 | static void __init kona_timer_init(void) | 196 | static void __init kona_timer_init(struct device_node *node) |
203 | { | 197 | { |
204 | kona_timers_init(); | 198 | kona_timers_init(node); |
205 | kona_timer_clockevents_init(); | 199 | kona_timer_clockevents_init(); |
206 | setup_irq(timers.tmr_irq, &kona_timer_irq); | 200 | setup_irq(timers.tmr_irq, &kona_timer_irq); |
207 | kona_timer_set_next_event((arch_timer_rate / HZ), NULL); | 201 | kona_timer_set_next_event((arch_timer_rate / HZ), NULL); |
208 | } | 202 | } |
209 | 203 | ||
210 | CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer", | 204 | CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer", kona_timer_init); |
211 | kona_timer_init); | ||