37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
|
From 7d7214129f7bde5bb55c0691968407b48f08efb5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
||
|
|
Date: Tue, 20 Aug 2013 12:45:53 -0300
|
||
|
|
Subject: [PATCH 170/203] 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>
|
||
|
|
---
|
||
|
|
drivers/clocksource/time-armada-370-xp.c | 7 +++++--
|
||
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
--- 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_c
|
||
|
|
|
||
|
|
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);
|
||
|
|
}
|