Commit d2353bad authored May 29, 2020 by Arnd Bergmann

ARM: omap2: fix omap5_realtime_timer_init definition

There is one more regression introduced by the last build fix:

arch/arm/mach-omap2/timer.c:170:6: error: attribute declaration must precede definition [-Werror,-Wignored-attributes]
void __init omap5_realtime_timer_init(void)
     ^
arch/arm/mach-omap2/common.h:118:20: note: previous definition is here
static inline void omap5_realtime_timer_init(void)
                   ^
arch/arm/mach-omap2/timer.c:170:13: error: redefinition of 'omap5_realtime_timer_init'
void __init omap5_realtime_timer_init(void)
            ^
arch/arm/mach-omap2/common.h:118:20: note: previous definition is here
static inline void omap5_realtime_timer_init(void)

Address this by removing the now obsolete #ifdefs in that file and
just building the entire file based on the flag that controls the
omap5_realtime_timer_init function declaration.

Link: https://lore.kernel.org/r/20200529201701.521933-1-arnd@arndb.de


Fixes: d86ad463 ("ARM: OMAP2+: Fix regression for using local timer on non-SMP SoCs")
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parent e4df11cb

arch/arm/mach-omap2/Makefile

+3 −3

Original line number	Diff line number	Diff line
		@@ -46,9 +46,9 @@ obj-$(CONFIG_SOC_OMAP5) += $(omap-4-5-common) $(smp-y) sleep44xx.o
		obj-$(CONFIG_SOC_AM43XX) += $(omap-4-5-common)
		obj-$(CONFIG_SOC_DRA7XX) += $(omap-4-5-common) $(smp-y) sleep44xx.o

		omap5-dra7-common = timer.o
		obj-$(CONFIG_SOC_OMAP5) += $(omap5-dra7-common)
		obj-$(CONFIG_SOC_DRA7XX) += $(omap5-dra7-common)
		omap5-dra7-common-$(CONFIG_SOC_HAS_REALTIME_COUNTER) = timer.o
		obj-$(CONFIG_SOC_OMAP5) += $(omap5-dra7-common-y)
		obj-$(CONFIG_SOC_DRA7XX) += $(omap5-dra7-common-y)

		# Functions loaded to SRAM
		obj-$(CONFIG_SOC_OMAP2420) += sram242x.o

arch/arm/mach-omap2/timer.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -39,8 +39,6 @@
		#define INCREMENTER_DENUMERATOR_RELOAD_OFFSET 0x14
		#define NUMERATOR_DENUMERATOR_MASK 0xfffff000

		#ifdef CONFIG_SOC_HAS_REALTIME_COUNTER

		static unsigned long arch_timer_freq;

		void set_cntfreq(void)
		@@ -159,14 +157,6 @@ sysclk1_based:
		iounmap(base);
		}

		#else

		static inline void realtime_counter_init(void)
		{
		}

		#endif /* CONFIG_SOC_HAS_REALTIME_COUNTER */

		void __init omap5_realtime_timer_init(void)
		{
		omap_clk_init();

Admin message