diff options
Diffstat (limited to 'arch/arm/mach-omap1/timer32k.c')
| -rw-r--r-- | arch/arm/mach-omap1/timer32k.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/arm/mach-omap1/timer32k.c b/arch/arm/mach-omap1/timer32k.c index 20cfbcc6c60c..13d7b8f145bd 100644 --- a/arch/arm/mach-omap1/timer32k.c +++ b/arch/arm/mach-omap1/timer32k.c | |||
| @@ -52,10 +52,9 @@ | |||
| 52 | #include <asm/irq.h> | 52 | #include <asm/irq.h> |
| 53 | #include <asm/mach/irq.h> | 53 | #include <asm/mach/irq.h> |
| 54 | #include <asm/mach/time.h> | 54 | #include <asm/mach/time.h> |
| 55 | #include <plat/common.h> | ||
| 55 | #include <plat/dmtimer.h> | 56 | #include <plat/dmtimer.h> |
| 56 | 57 | ||
| 57 | struct sys_timer omap_timer; | ||
| 58 | |||
| 59 | /* | 58 | /* |
| 60 | * --------------------------------------------------------------------------- | 59 | * --------------------------------------------------------------------------- |
| 61 | * 32KHz OS timer | 60 | * 32KHz OS timer |
| @@ -181,14 +180,14 @@ static __init void omap_init_32k_timer(void) | |||
| 181 | * Timer initialization | 180 | * Timer initialization |
| 182 | * --------------------------------------------------------------------------- | 181 | * --------------------------------------------------------------------------- |
| 183 | */ | 182 | */ |
| 184 | static void __init omap_timer_init(void) | 183 | bool __init omap_32k_timer_init(void) |
| 185 | { | 184 | { |
| 185 | omap_init_clocksource_32k(); | ||
| 186 | |||
| 186 | #ifdef CONFIG_OMAP_DM_TIMER | 187 | #ifdef CONFIG_OMAP_DM_TIMER |
| 187 | omap_dm_timer_init(); | 188 | omap_dm_timer_init(); |
| 188 | #endif | 189 | #endif |
| 189 | omap_init_32k_timer(); | 190 | omap_init_32k_timer(); |
| 190 | } | ||
| 191 | 191 | ||
| 192 | struct sys_timer omap_timer = { | 192 | return true; |
| 193 | .init = omap_timer_init, | 193 | } |
| 194 | }; | ||
