aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clocksource/timer-marco.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/clocksource/timer-marco.c')
-rw-r--r--drivers/clocksource/timer-marco.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/clocksource/timer-marco.c b/drivers/clocksource/timer-marco.c
index 7f5374dbefd9..dbd30398222a 100644
--- a/drivers/clocksource/timer-marco.c
+++ b/drivers/clocksource/timer-marco.c
@@ -252,15 +252,13 @@ static void __init sirfsoc_clockevent_init(void)
252} 252}
253 253
254/* initialize the kernel jiffy timer source */ 254/* initialize the kernel jiffy timer source */
255static void __init sirfsoc_marco_timer_init(void) 255static void __init sirfsoc_marco_timer_init(struct device_node *np)
256{ 256{
257 unsigned long rate; 257 unsigned long rate;
258 u32 timer_div; 258 u32 timer_div;
259 struct clk *clk; 259 struct clk *clk;
260 260
261 /* timer's input clock is io clock */ 261 clk = of_clk_get(np, 0);
262 clk = clk_get_sys("io", NULL);
263
264 BUG_ON(IS_ERR(clk)); 262 BUG_ON(IS_ERR(clk));
265 rate = clk_get_rate(clk); 263 rate = clk_get_rate(clk);
266 264
@@ -303,6 +301,6 @@ static void __init sirfsoc_of_timer_init(struct device_node *np)
303 if (!sirfsoc_timer1_irq.irq) 301 if (!sirfsoc_timer1_irq.irq)
304 panic("No irq passed for timer1 via DT\n"); 302 panic("No irq passed for timer1 via DT\n");
305 303
306 sirfsoc_marco_timer_init(); 304 sirfsoc_marco_timer_init(np);
307} 305}
308CLOCKSOURCE_OF_DECLARE(sirfsoc_marco_timer, "sirf,marco-tick", sirfsoc_of_timer_init ); 306CLOCKSOURCE_OF_DECLARE(sirfsoc_marco_timer, "sirf,marco-tick", sirfsoc_of_timer_init );