From 5e9fe6cb1ba5ad321473e7b9c39fbe164129520d Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Tue, 20 Aug 2013 12:45:53 -0300 Subject: 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 Signed-off-by: Daniel Lezcano Acked-by: Jason Cooper Acked-by: Gregory CLEMENT --- drivers/clocksource/time-armada-370-xp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'drivers/clocksource') 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) 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); } -- cgit v1.2.3