diff options
| author |   Linus Walleij <linus.walleij@linaro.org> | 2012-06-19 23:44:25 +0200 |
|---|---|---|
| committer |   Mike Turquette <mturquette@linaro.org> | 2012-07-11 15:36:45 -0700 |
| commit | 50667d63085af108f625c83102430c1d74931d78 (patch) | |
| tree | 62285dcaf8733ef5e9257db9ec6029ca7745c26c /arch/arm/mach-u300/timer.c | |
| parent | clk: cache parent clocks only for muxes (diff) | |
| download | linux-dev-50667d63085af108f625c83102430c1d74931d78.tar.xz linux-dev-50667d63085af108f625c83102430c1d74931d78.zip | |
ARM: u300: convert to common clock
This converts the U300 clock implementation over to use the common
struct clk and moves the implementation down into drivers/clk.
Since VCO isn't used in tree it was removed, it's not hard to
put it back in if need be.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
[mturquette@linaro.org: trivial Makefile conflict]
Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'arch/arm/mach-u300/timer.c')
| -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 bc1c7897e82d..56ac06d38ec1 100644 --- a/arch/arm/mach-u300/timer.c +++ b/arch/arm/mach-u300/timer.c @@ -354,7 +354,7 @@ static void __init u300_timer_init(void) /* Clock the interrupt controller */ clk = clk_get_sys("apptimer", NULL); BUG_ON(IS_ERR(clk)); - clk_enable(clk); + clk_prepare_enable(clk); rate = clk_get_rate(clk); setup_sched_clock(u300_read_sched_clock, 32, rate); |