projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'timer' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[deliverable/linux.git]
/
arch
/
arm
/
mach-omap2
/
timer.c
diff --git
a/arch/arm/mach-omap2/timer.c
b/arch/arm/mach-omap2/timer.c
index 8fe75a81e12db2415edc74e4ec19b4d8e0091df0..b5b5d92acd9df8695135f2f11ca5bc20ac67e73b 100644
(file)
--- a/
arch/arm/mach-omap2/timer.c
+++ b/
arch/arm/mach-omap2/timer.c
@@
-364,6
+364,11
@@
OMAP_SYS_TIMER_INIT(3_secure, OMAP3_SECURE_TIMER, OMAP3_CLKEV_SOURCE,
OMAP_SYS_TIMER(3_secure)
#endif
OMAP_SYS_TIMER(3_secure)
#endif
+#ifdef CONFIG_SOC_AM33XX
+OMAP_SYS_TIMER_INIT(3_am33xx, 1, OMAP4_MPU_SOURCE, 2, OMAP4_MPU_SOURCE)
+OMAP_SYS_TIMER(3_am33xx)
+#endif
+
#ifdef CONFIG_ARCH_OMAP4
#ifdef CONFIG_LOCAL_TIMERS
static DEFINE_TWD_LOCAL_TIMER(twd_local_timer,
#ifdef CONFIG_ARCH_OMAP4
#ifdef CONFIG_LOCAL_TIMERS
static DEFINE_TWD_LOCAL_TIMER(twd_local_timer,
This page took
0.024408 seconds
and
5
git commands to generate.