diff options
| author | Linus Walleij | 2013-05-23 15:42:33 +0200 |
|---|---|---|
| committer | Linus Walleij | 2013-06-17 13:54:37 +0200 |
| commit | bba5f2cc2f0fe4191ad2699c7c03a6def31f54e2 (patch) | |
| tree | fb7bc7d023f56292cc7c5b4335cbcfc77b611ba1 /arch/arm/mach-u300 | |
| parent | i2c: stu300: do not request a specific clock name (diff) | |
| download | kernel-qcow2-linux-bba5f2cc2f0fe4191ad2699c7c03a6def31f54e2.tar.gz kernel-qcow2-linux-bba5f2cc2f0fe4191ad2699c7c03a6def31f54e2.tar.xz kernel-qcow2-linux-bba5f2cc2f0fe4191ad2699c7c03a6def31f54e2.zip | |
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')
| -rw-r--r-- | arch/arm/mach-u300/timer.c | 2 |
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) pr_info("U300 GP1 timer @ base: %p, IRQ: %d\n", u300_timer_base, irq); /* Clock the interrupt controller */ - clk = clk_get_sys("apptimer", NULL); + clk = of_clk_get(np, 0); BUG_ON(IS_ERR(clk)); clk_prepare_enable(clk); rate = clk_get_rate(clk); |