diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2012-08-05 22:37:55 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-06 19:55:32 +0200 |
| commit | 8bb8148c78317e9360a21a0e69a58be6862adb07 (patch) | |
| tree | 002cc91bc3286d757d8b0ed990a99ebefa4250d3 /arch/arm/mach-integrator | |
| parent | Merge branch 'mxs/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linu... (diff) | |
| download | linux-8bb8148c78317e9360a21a0e69a58be6862adb07.tar.xz linux-8bb8148c78317e9360a21a0e69a58be6862adb07.zip | |
ARM: integrator: use clk_prepare_enable() for timer
The Integrator timer is using the clock framework to get the
timer frequency, but missed to prepare the clock before enabling.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-integrator')
| -rw-r--r-- | arch/arm/mach-integrator/integrator_ap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index 7b1055c8e0b9..3b2267529f5e 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c @@ -456,7 +456,7 @@ static void __init ap_init_timer(void) clk = clk_get_sys("ap_timer", NULL); BUG_ON(IS_ERR(clk)); - clk_enable(clk); + clk_prepare_enable(clk); rate = clk_get_rate(clk); writel(0, TIMER0_VA_BASE + TIMER_CTRL); |