Merge tag 'sunxi-core-for-3.16' of https://github.com/mripard/linux into next/soc

Merge "Allwinner SoCs core additions for 3.16" from Maxime Ripard:

Refactor the Kconfig options to have one Kconfig option per machine.

* tag 'sunxi-core-for-3.16' of https://github.com/mripard/linux:
  ARM: sunxi: select MFD_SUN6I_PRCM when sun6i arch support is enabled
  ARM: sunxi: Split the various SoCs support in Kconfig

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 31 insertions, 7 deletions

diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index b57d7d53b9d3..0fbd4f156bfa 100644
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -1,14 +1,38 @@
-config ARCH_SUNXI
-        bool "Allwinner A1X SOCs" if ARCH_MULTI_V7
-        select ARCH_HAS_RESET_CONTROLLER
+menuconfig ARCH_SUNXI
+        bool "Allwinner SoCs" if ARCH_MULTI_V7
         select ARCH_REQUIRE_GPIOLIB
-        select ARM_GIC
-        select ARM_PSCI
         select CLKSRC_MMIO
         select GENERIC_IRQ_CHIP
-        select HAVE_ARM_ARCH_TIMER
         select PINCTRL
         select PINCTRL_SUNXI
-        select RESET_CONTROLLER
         select SUN4I_TIMER
+
+if ARCH_SUNXI
+
+config MACH_SUN4I
+        bool "Allwinner A10 (sun4i) SoCs support"
+        default ARCH_SUNXI
+
+config MACH_SUN5I
+        bool "Allwinner A10s / A13 (sun5i) SoCs support"
+        default ARCH_SUNXI
+        select SUN5I_HSTIMER
+
+config MACH_SUN6I
+        bool "Allwinner A31 (sun6i) SoCs support"
+        default ARCH_SUNXI
+        select ARCH_HAS_RESET_CONTROLLER
+        select ARM_GIC
+        select MFD_SUN6I_PRCM
+        select RESET_CONTROLLER
+        select SUN5I_HSTIMER
+
+config MACH_SUN7I
+        bool "Allwinner A20 (sun7i) SoCs support"
+        default ARCH_SUNXI
+        select ARM_GIC
+        select ARM_PSCI
+        select HAVE_ARM_ARCH_TIMER
         select SUN5I_HSTIMER
+
+endif