Commit-ID: 5e9fe6cb1ba5ad321473e7b9c39fbe164129520d
Gitweb: http://git.kernel.org/tip/5e9fe6cb1ba5ad321473e7b9c39fbe164129520d
Author: Ezequiel Garcia <ezequiel.garcia@xxxxxxxxxxxxxxxxxx>
AuthorDate: Tue, 20 Aug 2013 12:45:53 -0300
Committer: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx>
CommitDate: Mon, 2 Sep 2013 21:44:52 +0200
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@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx>
Acked-by: Jason Cooper <jason@xxxxxxxxxxxxxx>
Acked-by: Gregory CLEMENT <gregory.clement@xxxxxxxxxxxxxxxxxx>
---
drivers/clocksource/time-armada-370-xp.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c
index 6ca185d..44c4fff 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)
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);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|