| Message ID | 1443542000-24958-1-git-send-email-balbi@ti.com |
|---|---|
| State | Superseded |
| Headers | show |
On 09/29/2015 10:53 AM, Felipe Balbi wrote: > 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 <nm@ti.com> > Signed-off-by: Felipe Balbi <balbi@ti.com> > --- > > changes since v2: > - move ifdefs around > > changes since v1: > - make sure result builds on AM43xx-only builds > > > arch/arm/mach-omap2/timer.c | 16 +++------------- > 1 file changed, 3 insertions(+), 13 deletions(-) > > diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c > index e4d8701f99f9..3ebe16cd645e 100644 > --- a/arch/arm/mach-omap2/timer.c > +++ b/arch/arm/mach-omap2/timer.c > @@ -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 */ > +#endif > > #if defined(CONFIG_SOC_OMAP5) || defined(CONFIG_SOC_DRA7XX) > void __init omap5_realtime_timer_init(void) > OK -> the change was subtle for v3 -> you now have the entire omap4_local_timer_init under the same #ifdef as for the rest. but then, you are wrong on $subject and commit message since you are no longer always enabling the local_timer_init. otherwise the change itself looks ok to me.
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index e4d8701f99f9..3ebe16cd645e 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -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 */ +#endif #if defined(CONFIG_SOC_OMAP5) || defined(CONFIG_SOC_DRA7XX) void __init omap5_realtime_timer_init(void)
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 <nm@ti.com> Signed-off-by: Felipe Balbi <balbi@ti.com> --- changes since v2: - move ifdefs around changes since v1: - make sure result builds on AM43xx-only builds arch/arm/mach-omap2/timer.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-)