Merge branch 'fixes' into for-linus

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

diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index 7b270358536e15f737a78f3b75e59f19a298908f..416d46ef7ebd3f3a477225327a708e5dd339a126 100644 (file)
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -6,6 +6,8 @@ config ARCH_MVEBU
        select GENERIC_IRQ_CHIP
        select IRQ_DOMAIN
        select MULTI_IRQ_HANDLER
+       select PINCTRL
+       select PLAT_ORION
        select SPARSE_IRQ
 
 if ARCH_MVEBU
@@ -13,13 +15,25 @@ if ARCH_MVEBU
 menu "Marvell SOC with device tree"
 
 config MACH_ARMADA_370_XP
-       bool "Marvell Armada 370 and Aramada XP boards"
+       bool
        select ARMADA_370_XP_TIMER
        select CPU_V7
+
+config MACH_ARMADA_370
+       bool "Marvell Armada 370 boards"
+       select MACH_ARMADA_370_XP
+       select PINCTRL_ARMADA_370
        help
+         Say 'Y' here if you want your kernel to support boards based
+         on the Marvell Armada 370 SoC with device tree.
 
-         Say 'Y' here if you want your kernel to support boards based on
-         Marvell Armada 370 or Armada XP with device tree.
+config MACH_ARMADA_XP
+       bool "Marvell Armada XP boards"
+       select MACH_ARMADA_370_XP
+       select PINCTRL_ARMADA_XP
+       help
+         Say 'Y' here if you want your kernel to support boards based
+         on the Marvell Armada XP SoC with device tree.
 
 endmenu