Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9682bcdef1a9a0af940c30250ede697e7e70ef28

Authored by Arnd Bergmann
1 parent a857c6e7d5
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

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>

Showing 1 changed file with 4 additions and 11 deletions Side-by-side Diff

drivers/clocksource/bcm_kona_timer.c
Diff comments   View file @ 9682bcd
... ... @@ -103,16 +103,10 @@
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 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 110 if (!of_property_read_u32(node, "clock-frequency", &freq))
117 111 arch_timer_rate = freq;
118 112 else
119 113  
120 114  
... ... @@ -199,14 +193,13 @@
199 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 199 kona_timer_clockevents_init();
206 200 setup_irq(timers.tmr_irq, &kona_timer_irq);
207 201 kona_timer_set_next_event((arch_timer_rate / HZ), NULL);
208 202 }
209 203  
210   -CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer",
211   - kona_timer_init);
  204 +CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer", kona_timer_init);