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