ARM: integrator: use clk_prepare_enable() for timer
authorLinus Walleij <linus.walleij@linaro.org>
Sun, 5 Aug 2012 20:37:55 +0000 (22:37 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 6 Aug 2012 17:55:32 +0000 (19:55 +0200)
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>
arch/arm/mach-integrator/integrator_ap.c

index 7b1055c8e0b98c6619473ca4bca9cd711ccc316c..3b2267529f5e308cc1c47c048375ffedd5a60f9a 100644 (file)
@@ -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);