clocksource: armada-370-xp: Get reference fixed-clock by name

ezequielgarcia · dlezcano · commit 5e9fe6cb1ba5 · 2013-09-02T21:44:52.000+02:00
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 &lt;ezequiel.garcia@free-electrons.com&gt;
Signed-off-by: Daniel Lezcano &lt;daniel.lezcano@linaro.org&gt;
Acked-by: Jason Cooper &lt;jason@lakedaemon.net&gt;
Acked-by: Gregory CLEMENT &lt;gregory.clement@free-electrons.com&gt;
diff --git 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)
 
 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);
 }

Original file line number	Diff line number	Diff line change
`@@ -294,8 +294,11 @@ static void __init armada_370_xp_timer_common_init(struct device_node *np)`
`294`	`294`
`295`	`295`	`static void __init armada_xp_timer_init(struct device_node *np)`
`296`	`296`	`{`
`297`		`- /* The fixed 25MHz timer is required, timer25Mhz is true by default */`
`298`		`- timer_clk = 25000000;`
	`297`	`+ struct clk *clk = of_clk_get_by_name(np, "fixed");`
	`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`	`303`	`armada_370_xp_timer_common_init(np);`
`301`	`304`	`}`