Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ad501cc authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: omap2: fix am43xx dependency on l2x0 cache 



Commit d941f86f ("ARM: l2c: AM43x: add L2 cache support") enabled
the L2 cache support for the am43xx SoC, but caused a build regression
when the driver for that cache controller is disabled:

arch/arm/mach-omap2/built-in.o: In function `am43xx_init_early':
:(.init.text+0xb20): undefined reference to `omap_l2_cache_init'

This did not happen for OMAP4, which has the same call, but enables
the l2x0 driver unconditionally. We could do the same thing for
am43xx, but it seems better to allow turning it off and make the
code work in either case.

This adds an inline wrapper for omap_l2_cache_init for the disabled
case, and removes the 'select' from OMAP4 so it becomes a user
visible option.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Cc: linux-omap@vger.kernel.org
parent 2dc24b0d

arch/arm/configs/omap2plus_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ CONFIG_SOC_OMAP5=y 
CONFIG_SOC_AM33XX=y

CONFIG_SOC_AM43XX=y

CONFIG_SOC_DRA7XX=y

CONFIG_CACHE_L2X0=y

CONFIG_ARM_THUMBEE=y

CONFIG_ARM_ERRATA_411920=y

CONFIG_SMP=y

arch/arm/mach-omap2/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ config ARCH_OMAP4 
	select ARM_CPU_SUSPEND if PM

	select ARM_ERRATA_720789

	select ARM_GIC

	select CACHE_L2X0

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select OMAP_INTERCONNECT

arch/arm/mach-omap2/common.h

+7 −0
Original line number Diff line number Diff line
@@ -91,7 +91,14 @@ extern void omap3_sync32k_timer_init(void); 
extern void omap3_secure_sync32k_timer_init(void);

extern void omap3_gptimer_timer_init(void);

extern void omap4_local_timer_init(void);

#ifdef CONFIG_CACHE_L2X0

int omap_l2_cache_init(void);

#else

static inline int omap_l2_cache_init(void)

{

	return 0;

}

#endif

extern void omap5_realtime_timer_init(void);



void omap2420_init_early(void);