aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzequiel Garcia <ezequiel.garcia@free-electrons.com>2013-08-20 11:45:53 -0400
committerDaniel Lezcano <daniel.lezcano@linaro.org>2013-09-02 15:44:52 -0400
commit5e9fe6cb1ba5ad321473e7b9c39fbe164129520d (patch)
tree3b17125e814bfbc21f82fb4f580d8d820024e566
parentec8e51120a5b167e22ee29f4f427a0cb66eb445b (diff)
clocksource: armada-370-xp: Get reference fixed-clock by name
The Armada XP timer has two mandatory clock inputs: nbclk and refclk, as specified by the device-tree binding. This commit fixes the clock selection. Instead of hard-coding the clock rate for the 25 MHz reference fixed-clock, obtain the clock by its name. Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Acked-by: Jason Cooper <jason@lakedaemon.net> Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
-rw-r--r--drivers/clocksource/time-armada-370-xp.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c
index 6ca185df48c4..44c4fff2f58c 100644
--- a/drivers/clocksource/time-armada-370-xp.c
+++ b/drivers/clocksource/time-armada-370-xp.c
@@ -294,8 +294,11 @@ static void __init armada_370_xp_timer_common_init(struct device_node *np)
294 294
295static void __init armada_xp_timer_init(struct device_node *np) 295static void __init armada_xp_timer_init(struct device_node *np)
296{ 296{
297 /* The fixed 25MHz timer is required, timer25Mhz is true by default */ 297 struct clk *clk = of_clk_get_by_name(np, "fixed");
298 timer_clk = 25000000; 298
299 /* The 25Mhz fixed clock is mandatory, and must always be available */
300 BUG_ON(IS_ERR(clk));
301 timer_clk = clk_get_rate(clk);
299 302
300 armada_370_xp_timer_common_init(np); 303 armada_370_xp_timer_common_init(np);
301} 304}