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<sb...@codeaurora.org>
Cc: David Brown<dav...@codeaurora.org>
Cc: Kukjin Kim<kgene....@samsung.com>
Cc: Linus Walleij<linus.wall...@linaro.org>
Cc: Pawel Moll<pawel.m...@arm.com>
Cc: Rob Herring<rob.herr...@calxeda.com>
Cc: Russell King<li...@arm.linux.org.uk>
Cc: Sascha Hauer<ker...@pengutronix.de>
Cc: Shiraz Hashim<shiraz.has...@st.com>
Cc: Simon Horman<ho...@verge.net.au>
Cc: Srinidhi Kasagar<srinidhi.kasa...@stericsson.com>
Cc: Stephen Warren<swar...@wwwdotorg.org>
Cc: Tony Lindgren<t...@atomide.com>
Cc: Viresh Kumar<viresh.li...@gmail.com>
---

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 ++++

[..]

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.

@@ -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 <santosh.shilim...@ti.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to