arm: omap2: timer: always define omap4_local_timer_init
Subsystems (3)
PATCH v2 1/1 arm: omap2: timer: always define omap4_local_timer_init
omap4_local_timer_init() can be used by other platforms as is. At least AM437x wants to use it. Instead of making omap4-only and providing a stub for builds without OMAP4, we can just always define that function.
---
changes since v1:
- make sure result builds on AM43xx-only builds
arch/arm/mach-omap2/timer.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
arch/arm/mach-omap2/timer.c +2 -12
@@ -634,32 +634,22 @@ OMAP_SYS_32K_TIMER_INIT(3_secure, 12, "secure_32k_fck", "ti,timer-secure", 2, "timer_sys_ck", NULL);#endif /* CONFIG_ARCH_OMAP3 */ -#if defined(CONFIG_ARCH_OMAP3 ) || defined(CONFIG_SOC_AM33XX ) || \ - defined(CONFIG_SOC_AM43XX ) +#if defined(CONFIG_ARCH_OMAP3 ) || defined(CONFIG_SOC_AM33XX )OMAP_SYS_GP_TIMER_INIT (3 ,2 ,"timer_sys_ck" ,NULL ,1 ,"timer_sys_ck" ,"ti,timer-alwon" );#endif #if defined(CONFIG_ARCH_OMAP4 ) || defined(CONFIG_SOC_OMAP5 ) || \ - defined(CONFIG_SOC_DRA7XX ) + defined(CONFIG_SOC_DRA7XX ) || defined(CONFIG_SOC_AM43XX ) static OMAP_SYS_32K_TIMER_INIT(4, 1, "timer_32k_ck", "ti,timer-alwon", 2, "sys_clkin_ck", NULL);#endif -#ifdef CONFIG_ARCH_OMAP4 -#ifdef CONFIG_HAVE_ARM_TWD void __init omap4_local_timer_init (void ) {omap4_sync32k_timer_init ();clocksource_of_init (); } -#else -void __init omap4_local_timer_init (void ) -{ -omap4_sync32k_timer_init (); -} -#endif /* CONFIG_HAVE_ARM_TWD */ -#endif /* CONFIG_ARCH_OMAP4 */ #if defined(CONFIG_SOC_OMAP5 ) || defined(CONFIG_SOC_DRA7XX )void __init omap5_realtime_timer_init (void )
Signature · 1 line
2.5.3
PATCH v2 1/1 arm: omap2: timer: always define omap4_local_timer_init
bit of nitpick on capitalization of $subject.. aside..
Quoted 30 lines · Felipe Balbi
omap4_local_timer_init()can be used by other platforms as is. At least AM437x wants to use it. Instead of making omap4-only and providing a stub for builds without OMAP4, we can just always define that function.Reported-by Nishanth Menon <[email protected]>Signed-off-by Felipe Balbi <[email protected]>---
changes since v1:
- make sure result builds on AM43xx-only buildsarch/arm/mach-omap2/timer.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)arch/arm/mach-omap2/timer.c +1
-2@@ -634,32 +634,22 @@ OMAP_SYS_32K_TIMER_INIT(3_secure, 12, "secure_32k_fck", "ti,timer-secure", 2, "timer_sys_ck", NULL);#endif /* CONFIG_ARCH_OMAP3 */ -#if defined(CONFIG_ARCH_OMAP3 ) || defined(CONFIG_SOC_AM33XX ) || \ - defined(CONFIG_SOC_AM43XX ) +#if defined(CONFIG_ARCH_OMAP3 ) || defined(CONFIG_SOC_AM33XX )OMAP_SYS_GP_TIMER_INIT (3 ,2 ,"timer_sys_ck" ,NULL ,1 ,"timer_sys_ck" ,"ti,timer-alwon" );#endif
arch/arm/mach-omap2/timer.c OMAP_SYS_32K_TIMER_INIT(3_secure, 12, "secure_32k_fck", "ti,timer-secure", · line 650
Quoted 10 lines
arch/arm/mach-omap2/timer.c +1
-3#if defined(CONFIG_ARCH_OMAP4 ) || defined(CONFIG_SOC_OMAP5 ) || \ - defined(CONFIG_SOC_DRA7XX ) + defined(CONFIG_SOC_DRA7XX ) || defined(CONFIG_SOC_AM43XX ) static OMAP_SYS_32K_TIMER_INIT(4, 1, "timer_32k_ck", "ti,timer-alwon", 2, "sys_clkin_ck", NULL);#endif -#ifdef CONFIG_ARCH_OMAP4 -#ifdef CONFIG_HAVE_ARM_TWD
OK -> so we removed both of these..
arch/arm/mach-omap2/timer.c OMAP_SYS_32K_TIMER_INIT(3_secure, 12, "secure_32k_fck", "ti,timer-secure", · line 650
Quoted 3 lines
arch/arm/mach-omap2/timer.c +0
-0void __init omap4_local_timer_init (void ) {omap4_sync32k_timer_init ();
but this only gets defined *if*
arch/arm/mach-omap2/timer.c OMAP_SYS_32K_TIMER_INIT(3_secure, 12, "secure_32k_fck", "ti,timer-secure", · line 643
Quoted 3 lines
arch/arm/mach-omap2/timer.c +1
-1#if defined(CONFIG_ARCH_OMAP4 ) || defined(CONFIG_SOC_OMAP5 ) || \ - defined(CONFIG_SOC_DRA7XX ) + defined(CONFIG_SOC_DRA7XX ) || defined(CONFIG_SOC_AM43XX )
we should fail build on omap3 only, correct??
or am i missing something else?
Quoted 13 lines
arch/arm/mach-omap2/timer.c +0
-7clocksource_of_init (); } -#else -void __init omap4_local_timer_init (void ) -{ -omap4_sync32k_timer_init (); -} -#endif /* CONFIG_HAVE_ARM_TWD */ -#endif /* CONFIG_ARCH_OMAP4 */ #if
defined(CONFIG_SOC_OMAP5)||defined(CONFIG_SOC_DRA7XX)void__initomap5_realtime_timer_init(void)
Signature · 2 lines
Regards, Nishanth Menon