aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-u300/timer.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-05-23 09:42:33 -0400
committerLinus Walleij <linus.walleij@linaro.org>2013-06-17 07:54:37 -0400
commitbba5f2cc2f0fe4191ad2699c7c03a6def31f54e2 (patch)
treefb7bc7d023f56292cc7c5b4335cbcfc77b611ba1 /arch/arm/mach-u300/timer.c
parent2165f836c8f7036491fae41e9bc327a3cdf2fea3 (diff)
ARM: u300: move the gated system controller clocks to DT
This moves the slow, fast, AHB bridge and "rest" clocks on the U300 system controller over to registration from the device tree. Acked-by: Mike Turquette <mturquette@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-u300/timer.c')
-rw-r--r--arch/arm/mach-u300/timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-u300/timer.c b/arch/arm/mach-u300/timer.c
index 2e1c81daf3c1..390ae5feb1d0 100644
--- a/arch/arm/mach-u300/timer.c
+++ b/arch/arm/mach-u300/timer.c
@@ -375,7 +375,7 @@ static void __init u300_timer_init_of(struct device_node *np)
375 pr_info("U300 GP1 timer @ base: %p, IRQ: %d\n", u300_timer_base, irq); 375 pr_info("U300 GP1 timer @ base: %p, IRQ: %d\n", u300_timer_base, irq);
376 376
377 /* Clock the interrupt controller */ 377 /* Clock the interrupt controller */
378 clk = clk_get_sys("apptimer", NULL); 378 clk = of_clk_get(np, 0);
379 BUG_ON(IS_ERR(clk)); 379 BUG_ON(IS_ERR(clk));
380 clk_prepare_enable(clk); 380 clk_prepare_enable(clk);
381 rate = clk_get_rate(clk); 381 rate = clk_get_rate(clk);