The TWD and SCU configs are selected by default as long asNope. OMAP5 don't use TWD. Infact the external SCU is also used
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<sboyd@xxxxxxxxxxxxxx>
Cc: David Brown<davidb@xxxxxxxxxxxxxx>
Cc: Kukjin Kim<kgene.kim@xxxxxxxxxxx>
Cc: Linus Walleij<linus.walleij@xxxxxxxxxx>
Cc: Pawel Moll<pawel.moll@xxxxxxx>
Cc: Rob Herring<rob.herring@xxxxxxxxxxx>
Cc: Russell King<linux@xxxxxxxxxxxxxxxx>
Cc: Sascha Hauer<kernel@xxxxxxxxxxxxxx>
Cc: Shiraz Hashim<shiraz.hashim@xxxxxx>
Cc: Simon Horman<horms@xxxxxxxxxxxx>
Cc: Srinidhi Kasagar<srinidhi.kasagar@xxxxxxxxxxxxxx>
Cc: Stephen Warren<swarren@xxxxxxxxxxxxx>
Cc: Tony Lindgren<tony@xxxxxxxxxxx>
Cc: Viresh Kumar<viresh.linux@xxxxxxxxx>
---
Does OMAP5 need to select TWD? I suspect not if it uses the
architected timers.
arch/arm/mach-omap2/Kconfig | 4 ++++
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/KconfigOk.
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
@@ -75,6 +77,8 @@ config SOC_OMAP5Drop this change.
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