diff options
Diffstat (limited to 'arch/arm/mach-omap2/timer.c')
-rw-r--r-- | arch/arm/mach-omap2/timer.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 2ff6d41ec6c6..3bdaf9877e0b 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c | |||
@@ -38,14 +38,17 @@ | |||
38 | #include <linux/slab.h> | 38 | #include <linux/slab.h> |
39 | 39 | ||
40 | #include <asm/mach/time.h> | 40 | #include <asm/mach/time.h> |
41 | #include <plat/dmtimer.h> | ||
42 | #include <asm/smp_twd.h> | 41 | #include <asm/smp_twd.h> |
43 | #include <asm/sched_clock.h> | 42 | #include <asm/sched_clock.h> |
44 | #include "common.h" | 43 | |
45 | #include <plat/omap_hwmod.h> | 44 | #include <plat/omap_hwmod.h> |
46 | #include <plat/omap_device.h> | 45 | #include <plat/omap_device.h> |
46 | #include <plat/dmtimer.h> | ||
47 | #include <plat/omap-pm.h> | 47 | #include <plat/omap-pm.h> |
48 | 48 | ||
49 | #include <mach/hardware.h> | ||
50 | |||
51 | #include "common.h" | ||
49 | #include "powerdomain.h" | 52 | #include "powerdomain.h" |
50 | 53 | ||
51 | /* Parent clocks, eventually these will come from the clock framework */ | 54 | /* Parent clocks, eventually these will come from the clock framework */ |
@@ -373,8 +376,7 @@ OMAP_SYS_TIMER(3_am33xx) | |||
373 | #ifdef CONFIG_ARCH_OMAP4 | 376 | #ifdef CONFIG_ARCH_OMAP4 |
374 | #ifdef CONFIG_LOCAL_TIMERS | 377 | #ifdef CONFIG_LOCAL_TIMERS |
375 | static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, | 378 | static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, |
376 | OMAP44XX_LOCAL_TWD_BASE, | 379 | OMAP44XX_LOCAL_TWD_BASE, 29 + OMAP_INTC_START); |
377 | OMAP44XX_IRQ_LOCALTIMER); | ||
378 | #endif | 380 | #endif |
379 | 381 | ||
380 | static void __init omap4_timer_init(void) | 382 | static void __init omap4_timer_init(void) |