]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
clocksource: armada-370-xp: Get reference fixed-clock by name
authorEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Tue, 20 Aug 2013 15:45:53 +0000 (12:45 -0300)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Mon, 2 Sep 2013 19:44:52 +0000 (21:44 +0200)
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>
drivers/clocksource/time-armada-370-xp.c

index 6ca185df48c4e924c1737b5eba8b8d9082167d5f..44c4fff2f58cc086f8bcd5e94c9bd7b7c8e1fd55 100644 (file)
@@ -294,8 +294,11 @@ static void __init armada_370_xp_timer_common_init(struct device_node *np)
 
 static void __init armada_xp_timer_init(struct device_node *np)
 {
-       /* The fixed 25MHz timer is required, timer25Mhz is true by default */
-       timer_clk = 25000000;
+       struct clk *clk = of_clk_get_by_name(np, "fixed");
+
+       /* The 25Mhz fixed clock is mandatory, and must always be available */
+       BUG_ON(IS_ERR(clk));
+       timer_clk = clk_get_rate(clk);
 
        armada_370_xp_timer_common_init(np);
 }