Re: [PATCH] ARM: OMAP2: use correct timer function for AM43XX and TI81XX
* Felipe Balbi[151119 08:16]: > > Hi, > > Arnd Bergmann writes: > > On Monday 16 November 2015 15:13:55 Felipe Balbi wrote: > >> Arnd Bergmann writes: > >> > AM43XX and TI81XX use omap3_gptimer_timer_init(), but that is only > >> > built into the kernel for OMAP3 and AM33XX, otherwise we get: > >> > > >> > arch/arm/mach-omap2/built-in.o:(.arch.info.init+0x124): undefined > >> > reference to `omap3_gptimer_timer_init' > >> > > >> > This changes the Kconfig logic for building the function to > >> > match the callers. Consequently, we no longer need to build > >> > the omap3_secure_sync32k_timer_init and omap4_local_timer_init > >> > for the platforms that have been moved over to other functions. > >> > > >> > Signed-off-by: Arnd Bergmann > >> > >> no, AM43xx uses omap4_local_timer_init(), there's already a fix in > >> Tony's tree IIRC. > > ... > > > >> care to provide a defconfig which would cause a build error ? > > > > My mistake, the code has changed several times and I adapted it to > > the latest version each time, but the version I sent out is indeed > > useless. > > > > The only hunk that still makes sense is > > > > diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c > > index b18ebbefae09..b7ab09cc5ca2 100644 > > --- a/arch/arm/mach-omap2/timer.c > > +++ b/arch/arm/mach-omap2/timer.c > > @@ -494,7 +494,7 @@ void __init omap_init_time(void) > > clocksource_probe(); > > } > > > > -#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM43XX) > > +#if defined(CONFIG_ARCH_OMAP3) > > void __init omap3_secure_sync32k_timer_init(void) > > { > > __omap_sync32k_timer_init(12, "secure_32k_fck", "ti,timer-secure", > > > > > > but that is harmless as it does not cause a build error, just a few extra > > bytes for an unused function in a AM43XX-only configuration. > > I think that's still useful. Tony ? Yeah makes sense to me. We already have omap4_sync32k_timer_init() when am437x PM gets enabled. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ARM: OMAP2: use correct timer function for AM43XX and TI81XX
Hi, Arnd Bergmannwrites: > On Monday 16 November 2015 15:13:55 Felipe Balbi wrote: >> Arnd Bergmann writes: >> > AM43XX and TI81XX use omap3_gptimer_timer_init(), but that is only >> > built into the kernel for OMAP3 and AM33XX, otherwise we get: >> > >> > arch/arm/mach-omap2/built-in.o:(.arch.info.init+0x124): undefined >> > reference to `omap3_gptimer_timer_init' >> > >> > This changes the Kconfig logic for building the function to >> > match the callers. Consequently, we no longer need to build >> > the omap3_secure_sync32k_timer_init and omap4_local_timer_init >> > for the platforms that have been moved over to other functions. >> > >> > Signed-off-by: Arnd Bergmann >> >> no, AM43xx uses omap4_local_timer_init(), there's already a fix in >> Tony's tree IIRC. > ... > >> care to provide a defconfig which would cause a build error ? > > My mistake, the code has changed several times and I adapted it to > the latest version each time, but the version I sent out is indeed > useless. > > The only hunk that still makes sense is > > diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c > index b18ebbefae09..b7ab09cc5ca2 100644 > --- a/arch/arm/mach-omap2/timer.c > +++ b/arch/arm/mach-omap2/timer.c > @@ -494,7 +494,7 @@ void __init omap_init_time(void) > clocksource_probe(); > } > > -#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM43XX) > +#if defined(CONFIG_ARCH_OMAP3) > void __init omap3_secure_sync32k_timer_init(void) > { > __omap_sync32k_timer_init(12, "secure_32k_fck", "ti,timer-secure", > > > but that is harmless as it does not cause a build error, just a few extra > bytes for an unused function in a AM43XX-only configuration. I think that's still useful. Tony ? -- balbi signature.asc Description: PGP signature
Re: [PATCH] ARM: OMAP2: use correct timer function for AM43XX and TI81XX
On Monday 16 November 2015 15:13:55 Felipe Balbi wrote: > Arnd Bergmannwrites: > > AM43XX and TI81XX use omap3_gptimer_timer_init(), but that is only > > built into the kernel for OMAP3 and AM33XX, otherwise we get: > > > > arch/arm/mach-omap2/built-in.o:(.arch.info.init+0x124): undefined reference > > to `omap3_gptimer_timer_init' > > > > This changes the Kconfig logic for building the function to > > match the callers. Consequently, we no longer need to build > > the omap3_secure_sync32k_timer_init and omap4_local_timer_init > > for the platforms that have been moved over to other functions. > > > > Signed-off-by: Arnd Bergmann > > no, AM43xx uses omap4_local_timer_init(), there's already a fix in > Tony's tree IIRC. ... > care to provide a defconfig which would cause a build error ? My mistake, the code has changed several times and I adapted it to the latest version each time, but the version I sent out is indeed useless. The only hunk that still makes sense is diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index b18ebbefae09..b7ab09cc5ca2 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -494,7 +494,7 @@ void __init omap_init_time(void) clocksource_probe(); } -#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM43XX) +#if defined(CONFIG_ARCH_OMAP3) void __init omap3_secure_sync32k_timer_init(void) { __omap_sync32k_timer_init(12, "secure_32k_fck", "ti,timer-secure", but that is harmless as it does not cause a build error, just a few extra bytes for an unused function in a AM43XX-only configuration. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] ARM: OMAP2: use correct timer function for AM43XX and TI81XX
AM43XX and TI81XX use omap3_gptimer_timer_init(), but that is only built into the kernel for OMAP3 and AM33XX, otherwise we get: arch/arm/mach-omap2/built-in.o:(.arch.info.init+0x124): undefined reference to `omap3_gptimer_timer_init' This changes the Kconfig logic for building the function to match the callers. Consequently, we no longer need to build the omap3_secure_sync32k_timer_init and omap4_local_timer_init for the platforms that have been moved over to other functions. Signed-off-by: Arnd Bergmann--- The code has changed a couple of times, but this version no longer produces build errors for me. diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index b18ebbefae09..b07dd70b2de1 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -494,7 +494,7 @@ void __init omap_init_time(void) clocksource_probe(); } -#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM43XX) +#if defined(CONFIG_ARCH_OMAP3) void __init omap3_secure_sync32k_timer_init(void) { __omap_sync32k_timer_init(12, "secure_32k_fck", "ti,timer-secure", @@ -502,7 +502,7 @@ void __init omap3_secure_sync32k_timer_init(void) } #endif /* CONFIG_ARCH_OMAP3 */ -#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX) +#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX) || defined(CONFIG_SOC_TI81XX) void __init omap3_gptimer_timer_init(void) { __omap_sync32k_timer_init(2, "timer_sys_ck", NULL, @@ -510,8 +510,7 @@ void __init omap3_gptimer_timer_init(void) } #endif -#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || \ - defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX) +#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX) static void __init omap4_sync32k_timer_init(void) { __omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon", -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ARM: OMAP2: use correct timer function for AM43XX and TI81XX
Hi, Arnd Bergmannwrites: > AM43XX and TI81XX use omap3_gptimer_timer_init(), but that is only > built into the kernel for OMAP3 and AM33XX, otherwise we get: > > arch/arm/mach-omap2/built-in.o:(.arch.info.init+0x124): undefined reference > to `omap3_gptimer_timer_init' > > This changes the Kconfig logic for building the function to > match the callers. Consequently, we no longer need to build > the omap3_secure_sync32k_timer_init and omap4_local_timer_init > for the platforms that have been moved over to other functions. > > Signed-off-by: Arnd Bergmann no, AM43xx uses omap4_local_timer_init(), there's already a fix in Tony's tree IIRC. > +#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX) || > defined(CONFIG_SOC_TI81XX) [...] > +#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || > defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX) someone doesn't like to run checkpatch.pl care to provide a defconfig which would cause a build error ? -- balbi signature.asc Description: PGP signature