diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2013-08-01 13:03:03 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-08-02 13:46:14 -0700 |
| commit | 18060f3541cf020d63340bf4c1f9fb82427a7a2a (patch) | |
| tree | c1b14377dcbc418d1b64ef5ca0fb9b20b3d5aa9c | |
| parent | 47dcd3563e45fc5a59bf7f3326ef56087be8bebe (diff) | |
| download | blackbird-op-linux-18060f3541cf020d63340bf4c1f9fb82427a7a2a.tar.gz blackbird-op-linux-18060f3541cf020d63340bf4c1f9fb82427a7a2a.zip | |
ARM: OMAP2+: Fix fallout from localtimer divorce and SMP=n
A recent patch ef3160c (ARM: OMAP2+: Divorce from local timer API,
2013-03-04) broke the omap build when SMP=n because the TWD functions
are only compiled on SMP=y builds. Stub out the TWD calls when the TWD
isn't built in to to keep everything building.
arch/arm/mach-omap2/built-in.o: In function `omap4_local_timer_init':
dss-common.c:(.init.text+0x1d90): undefined reference to `twd_local_timer_register'
Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/mach-omap2/timer.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 8e99ca368e07..5a9ee0b48b62 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -600,6 +600,7 @@ static OMAP_SYS_32K_TIMER_INIT(4, 1, "timer_32k_ck", "ti,timer-alwon", #endif #ifdef CONFIG_ARCH_OMAP4 +#ifdef CONFIG_HAVE_ARM_TWD static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, OMAP44XX_LOCAL_TWD_BASE, 29); void __init omap4_local_timer_init(void) { @@ -618,6 +619,12 @@ void __init omap4_local_timer_init(void) pr_err("twd_local_timer_register failed %d\n", err); } } +#else +void __init omap4_local_timer_init(void) +{ + omap4_sync32k_timer_init(); +} +#endif /* CONFIG_HAVE_ARM_TWD */ #endif /* CONFIG_ARCH_OMAP4 */ #ifdef CONFIG_SOC_OMAP5 |
