tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ARM: Push selects for TWD/SCU into machine entries

The TWD and SCU configs are selected by default as long as
MSM_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 MSM_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 by default.

Push the select out to the machine entries so that we can compile
these machines together and still select the appropriate configs.

Cc: Barry Song <baohua.song@csr.com>
Acked-by: David Brown <davidb@codeaurora.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Pawel Moll <pawel.moll@arm.com>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Russell King <linux@arm.linux.org.uk>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Shiraz Hashim <shiraz.hashim@st.com>
Acked-by: Simon Horman <horms@verge.net.au>
Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Tony Lindgren <tony@atomide.com>
Acked-by: Viresh Kumar <viresh.linux@gmail.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

authored by

Stephen Boyd and committed by
Arnd Bergmann 4c3ffffd 494cc760

+30 -8
+2 -2
arch/arm/Kconfig
··· 637 637 bool "Renesas SH-Mobile / R-Mobile" 638 638 select CLKDEV_LOOKUP 639 639 select GENERIC_CLOCKEVENTS 640 + select HAVE_ARM_SCU if SMP 641 + select HAVE_ARM_TWD if LOCAL_TIMERS 640 642 select HAVE_CLK 641 643 select HAVE_MACH_CLKDEV 642 644 select HAVE_SMP ··· 1402 1400 depends on GENERIC_CLOCKEVENTS 1403 1401 depends on HAVE_SMP 1404 1402 depends on MMU 1405 - select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP 1406 1403 select USE_GENERIC_SMP_HELPERS 1407 1404 help 1408 1405 This enables support for systems with more than one CPU. If you have ··· 1526 1525 bool "Use local timer interrupts" 1527 1526 depends on SMP 1528 1527 default y 1529 - select HAVE_ARM_TWD if (!ARCH_MSM_SCORPIONMP && !EXYNOS4_MCT) 1530 1528 help 1531 1529 Enable support for local timers on SMP platforms, rather then the 1532 1530 legacy IPI broadcast method. Local timers allows the system
+2
arch/arm/mach-exynos/Kconfig
··· 14 14 config ARCH_EXYNOS4 15 15 bool "SAMSUNG EXYNOS4" 16 16 default y 17 + select HAVE_ARM_SCU if SMP 17 18 select HAVE_SMP 18 19 select MIGHT_HAVE_CACHE_L2X0 19 20 help ··· 22 21 23 22 config ARCH_EXYNOS5 24 23 bool "SAMSUNG EXYNOS5" 24 + select HAVE_ARM_SCU if SMP 25 25 select HAVE_SMP 26 26 help 27 27 Samsung EXYNOS5 (Cortex-A15) SoC based systems
+1
arch/arm/mach-highbank/Kconfig
··· 12 12 select CPU_V7 13 13 select GENERIC_CLOCKEVENTS 14 14 select HAVE_ARM_SCU 15 + select HAVE_ARM_TWD if LOCAL_TIMERS 15 16 select HAVE_SMP 16 17 select MAILBOX 17 18 select PL320_MBOX
+2 -1
arch/arm/mach-imx/Kconfig
··· 811 811 select ARM_GIC 812 812 select COMMON_CLK 813 813 select CPU_V7 814 - select HAVE_ARM_SCU 814 + select HAVE_ARM_SCU if SMP 815 + select HAVE_ARM_TWD if LOCAL_TIMERS 815 816 select HAVE_CAN_FLEXCAN if CAN 816 817 select HAVE_IMX_GPC 817 818 select HAVE_IMX_MMDC
+2 -5
arch/arm/mach-msm/Kconfig
··· 44 44 45 45 config ARCH_MSM8X60 46 46 bool "MSM8X60" 47 - select ARCH_MSM_SCORPIONMP 48 47 select ARM_GIC 49 48 select CPU_V7 50 49 select GPIO_MSM_V2 50 + select HAVE_SMP 51 51 select MSM_GPIOMUX 52 52 select MSM_SCM if SMP 53 53 select MSM_V2_TLMM ··· 55 55 56 56 config ARCH_MSM8960 57 57 bool "MSM8960" 58 - select ARCH_MSM_SCORPIONMP 59 58 select ARM_GIC 60 59 select CPU_V7 60 + select HAVE_SMP 61 61 select MSM_GPIOMUX 62 62 select MSM_SCM if SMP 63 63 select MSM_V2_TLMM ··· 68 68 69 69 config MSM_SOC_REV_A 70 70 bool 71 - config ARCH_MSM_SCORPIONMP 72 - bool 73 - select HAVE_SMP 74 71 75 72 config ARCH_MSM_ARM11 76 73 bool
+2
arch/arm/mach-omap2/Kconfig
··· 87 87 select ARM_GIC 88 88 select CACHE_L2X0 89 89 select CPU_V7 90 + select HAVE_ARM_SCU if SMP 91 + select HAVE_ARM_TWD if LOCAL_TIMERS 90 92 select HAVE_SMP 91 93 select LOCAL_TIMERS if SMP 92 94 select OMAP_INTERCONNECT
+1
arch/arm/mach-prima2/Kconfig
··· 36 36 default y 37 37 select ARM_GIC 38 38 select CPU_V7 39 + select HAVE_ARM_SCU if SMP 39 40 select HAVE_SMP 40 41 select SMP_ON_UP 41 42 help
+8
arch/arm/mach-realview/Kconfig
··· 12 12 bool "Support Multicore Cortex-A9 Tile" 13 13 depends on MACH_REALVIEW_EB 14 14 select CPU_V7 15 + select HAVE_ARM_SCU if SMP 16 + select HAVE_ARM_TWD if LOCAL_TIMERS 15 17 select HAVE_SMP 16 18 select MIGHT_HAVE_CACHE_L2X0 17 19 help ··· 25 23 depends on MACH_REALVIEW_EB 26 24 select ARCH_HAS_BARRIERS if SMP 27 25 select CPU_V6K 26 + select HAVE_ARM_SCU if SMP 27 + select HAVE_ARM_TWD if LOCAL_TIMERS 28 28 select HAVE_SMP 29 29 select MIGHT_HAVE_CACHE_L2X0 30 30 help ··· 47 43 select ARCH_HAS_BARRIERS if SMP 48 44 select ARM_GIC 49 45 select CPU_V6K 46 + select HAVE_ARM_SCU if SMP 47 + select HAVE_ARM_TWD if LOCAL_TIMERS 50 48 select HAVE_PATA_PLATFORM 51 49 select HAVE_SMP 52 50 select MIGHT_HAVE_CACHE_L2X0 ··· 91 85 bool "Support RealView(R) Platform Baseboard Explore" 92 86 select ARCH_SPARSEMEM_ENABLE if CPU_V7 && !REALVIEW_HIGH_PHYS_OFFSET 93 87 select ARM_GIC 88 + select HAVE_ARM_SCU if SMP 89 + select HAVE_ARM_TWD if LOCAL_TIMERS 94 90 select HAVE_PATA_PLATFORM 95 91 select HAVE_SMP 96 92 select MIGHT_HAVE_CACHE_L2X0
+2
arch/arm/mach-spear/Kconfig
··· 22 22 select ARM_GIC 23 23 select CPU_V7 24 24 select GPIO_SPEAR_SPICS 25 + select HAVE_ARM_SCU if SMP 26 + select HAVE_ARM_TWD if LOCAL_TIMERS 25 27 select HAVE_SMP 26 28 select MIGHT_HAVE_CACHE_L2X0 27 29 select PINCTRL
+2
arch/arm/mach-tegra/Kconfig
··· 7 7 select CLKSRC_OF 8 8 select COMMON_CLK 9 9 select GENERIC_CLOCKEVENTS 10 + select HAVE_ARM_SCU if SMP 11 + select HAVE_ARM_TWD if LOCAL_TIMERS 10 12 select HAVE_CLK 11 13 select HAVE_SMP 12 14 select MIGHT_HAVE_CACHE_L2X0
+2
arch/arm/mach-ux500/Kconfig
··· 7 7 select CLKDEV_LOOKUP 8 8 select CPU_V7 9 9 select GENERIC_CLOCKEVENTS 10 + select HAVE_ARM_SCU if SMP 11 + select HAVE_ARM_TWD if LOCAL_TIMERS 10 12 select HAVE_SMP 11 13 select MIGHT_HAVE_CACHE_L2X0 12 14 help
+2
arch/arm/mach-vexpress/Kconfig
··· 9 9 select COMMON_CLK_VERSATILE 10 10 select CPU_V7 11 11 select GENERIC_CLOCKEVENTS 12 + select HAVE_ARM_SCU if SMP 13 + select HAVE_ARM_TWD if LOCAL_TIMERS 12 14 select HAVE_CLK 13 15 select HAVE_PATA_PLATFORM 14 16 select HAVE_SMP
+2
arch/arm/mach-zynq/Kconfig
··· 5 5 select COMMON_CLK 6 6 select CPU_V7 7 7 select GENERIC_CLOCKEVENTS 8 + select HAVE_ARM_SCU if SMP 9 + select HAVE_ARM_TWD if LOCAL_TIMERS 8 10 select ICST 9 11 select MIGHT_HAVE_CACHE_L2X0 10 12 select USE_OF