[PATCH] ARM: Push selects for TWD/SCU into machine entries
From: Santosh Shilimkar <hidden>
Date: 2012-10-04 09:13:07
Also in:
lkml
On Thursday 04 October 2012 02:20 PM, Stephen Boyd wrote:
The TWD and SCU configs are selected by default as long as SCORPIONMP is false and/or MCT is false. Implementing the logic this way certainly saves lines in the Kconfig but it precludes those machines which select SCORPIONMP or MCT from participating in the single zImage effort because when those machines are combined with other SMP capable machines the TWD and SCU are no longer selected. Push the select out to the machine entries so that we can compile these machines together and still select the appropriate configs. Signed-off-by: Stephen Boyd<redacted> Cc: David Brown<redacted> Cc: Kukjin Kim<redacted> Cc: Linus Walleij<redacted> Cc: Pawel Moll<redacted> Cc: Rob Herring<redacted> Cc: Russell King<redacted> Cc: Sascha Hauer<kernel@pengutronix.de> Cc: Shiraz Hashim<redacted> Cc: Simon Horman<horms@verge.net.au> Cc: Srinidhi Kasagar<redacted> Cc: Stephen Warren<redacted> Cc: Tony Lindgren<tony@atomide.com> Cc: Viresh Kumar<redacted> --- Does OMAP5 need to select TWD? I suspect not if it uses the architected timers.
Nope. OMAP5 don't use TWD. Infact the external SCU is also used for A9 SOCs. You might want to check other A15 SOCS for SCU as well. [..]
arch/arm/mach-omap2/Kconfig | 4 ++++
[..]
quoted hunk ↗ jump to hunk
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index a6219ea..b618748 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig@@ -58,7 +58,9 @@ config ARCH_OMAP4 select CPU_V7 select ARM_GIC select HAVE_SMP + select HAVE_ARM_SCU if SMP select LOCAL_TIMERS if SMP + select HAVE_ARM_TWD if LOCAL_TIMERS select PL310_ERRATA_588369 select PL310_ERRATA_727915 select ARM_ERRATA_720789
Ok.
quoted hunk ↗ jump to hunk
@@ -75,6 +77,8 @@ config SOC_OMAP5 select CPU_V7 select ARM_GIC select HAVE_SMP + select HAVE_ARM_SCU if SMP + select HAVE_ARM_TWD if LOCAL_TIMERS select ARM_CPU_SUSPEND if PM select SOC_HAS_REALTIME_COUNTER select ARM_ARCH_TIMER
Drop this change. With that fixed, for OMAP changes Acked-by: Santosh Shilimkar <redacted>