diff options
| author | Andy Green <andy.green@linaro.org> | 2012-02-07 13:29:56 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2012-02-07 14:12:53 +0800 |
| commit | 422f808b68ca2fbc687935aafb37c3d16dc832f9 (patch) | |
| tree | a0545d206d408340d4677a61580843dff1f06876 | |
| parent | 3757678cb7fda55f6f2b6eadd63aba1a6940eec1 (diff) | |
uplevel provide dummy localtimer api now its done by resources54xx-3.3-rc1-1
Signed-off-by: Andy Green <andy.green@linaro.org>
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/timer.c | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index d68dc892087..571360d7189 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -69,6 +69,7 @@ config ARCH_OMAP5 select MISC_DEVICES if !MACH_OMAP_5430ZEBU select EMIF if !MACH_OMAP_5430ZEBU select USB_ARCH_HAS_EHCI if USB_SUPPORT + select LOCAL_TIMERS if SMP comment "OMAP Core Type" depends on ARCH_OMAP2 diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 76e65716bcd..5cbe6573f93 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -375,10 +375,18 @@ static void __init omap4_twd_init(void) if (err) pr_err("twd_timer_register failed %d\n", err); } + #else #define omap4_twd_init NULL #endif +/* main twd code wants to see this, despite it is deprecated now */ + +int __cpuinit local_timer_setup(struct clock_event_device *evt) +{ + return 0; +} + #ifdef CONFIG_ARCH_OMAP4 static void __init omap4_timer_init(void) { |