Skip to content

Commit

Permalink
clocksource: armada-370-xp: Get reference fixed-clock by name
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ezequiel Garcia authored and Daniel Lezcano committed Sep 2, 2013
1 parent ec8e511 commit 5e9fe6c
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/clocksource/time-armada-370-xp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 5e9fe6c

Please sign in to comment.