Merge branch 'late/fixes' into fixes

[~andy/linux] / arch / arm / mach-prima2 / Kconfig

diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig
index 4f7379fe01e24c5f00c06e2ed92002db531250f4..6988b117fc174a70e049df575417dea3093daa1b 100644 (file)
--- a/arch/arm/mach-prima2/Kconfig
+++ b/arch/arm/mach-prima2/Kconfig
@@ -1,6 +1,26 @@
+config ARCH_SIRF
+       bool "CSR SiRF" if ARCH_MULTI_V7
+       select ARCH_REQUIRE_GPIOLIB
+       select GENERIC_CLOCKEVENTS
+       select GENERIC_IRQ_CHIP
+       select MIGHT_HAVE_CACHE_L2X0
+       select NO_IOPORT
+       select PINCTRL
+       select PINCTRL_SIRF
+       help
+         Support for CSR SiRFprimaII/Marco/Polo platforms
+
 if ARCH_SIRF
 
-menu "CSR SiRF primaII/Marco/Polo Specific Features"
+menu "CSR SiRF atlas6/primaII/Marco/Polo Specific Features"
+
+config ARCH_ATLAS6
+       bool "CSR SiRFSoC ATLAS6 ARM Cortex A9 Platform"
+       default y
+       select CPU_V7
+       select SIRF_IRQ
+       help
+          Support for CSR SiRFSoC ARM Cortex A9 Platform
 
 config ARCH_PRIMA2
        bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform"
@@ -16,8 +36,9 @@ config ARCH_MARCO
        default y
        select ARM_GIC
        select CPU_V7
+       select HAVE_ARM_SCU if SMP
        select HAVE_SMP
-       select SMP_ON_UP
+       select SMP_ON_UP if SMP
        help
           Support for CSR SiRFSoC ARM Cortex A9 Platform