diff options
author | Cyril Chemparathy <cyril@ti.com> | 2010-03-25 17:43:45 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@deeprootsystems.com> | 2010-05-06 18:02:03 -0400 |
commit | 8ca2e597fc8f3337cef1f8febab482fe8c52b004 (patch) | |
tree | 8f173292e5a6e03a94fff14b18efcee680c50b1b /arch/arm/mach-davinci/time.c | |
parent | b722049d7e60356fe04bcac6065a7c8b1c64c06f (diff) |
Davinci: enable timer clock before use
timer_init() programs timer64 hardware. The module should ideally be brought
out of reset before this happens.
Signed-off-by: Cyril Chemparathy <cyril@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-davinci/time.c')
-rw-r--r-- | arch/arm/mach-davinci/time.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c index 9e0b106b4f5f..b21f7633d9a8 100644 --- a/arch/arm/mach-davinci/time.c +++ b/arch/arm/mach-davinci/time.c | |||
@@ -361,13 +361,13 @@ static void __init davinci_timer_init(void) | |||
361 | } | 361 | } |
362 | } | 362 | } |
363 | 363 | ||
364 | /* init timer hw */ | ||
365 | timer_init(); | ||
366 | |||
367 | timer_clk = clk_get(NULL, "timer0"); | 364 | timer_clk = clk_get(NULL, "timer0"); |
368 | BUG_ON(IS_ERR(timer_clk)); | 365 | BUG_ON(IS_ERR(timer_clk)); |
369 | clk_enable(timer_clk); | 366 | clk_enable(timer_clk); |
370 | 367 | ||
368 | /* init timer hw */ | ||
369 | timer_init(); | ||
370 | |||
371 | davinci_clock_tick_rate = clk_get_rate(timer_clk); | 371 | davinci_clock_tick_rate = clk_get_rate(timer_clk); |
372 | 372 | ||
373 | /* setup clocksource */ | 373 | /* setup clocksource */ |