arm: mvebu: split Kconfig options for Armada 370 and XP

Until now, all the code for Armada 370 and XP was common, so we had a
single Kconfig option to support all boards using both SoCs. With the
addition of pinctrl drivers, this situation has changed: those two
SoCs are radically different in terms of pinctrl, so they have two
separate drivers. Since pinctrl drivers are typically select-ed from
the SoC Kconfig option, it makes sense to split the 370/XP option into
two separate options: one for Armada 370 and another for Armada XP.

We keep an hidden option selected by both ARMADA_370 and ARMADA_XP in
order to easily compile common code.

A followup patch actually makes use of this split to select the
appropriate pinctrl drivers.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gregory Clement <gregory.clement@free-electrons.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index caa2c5e734fefeabbf9abab10e6d7e9fb48829b3..5540a8b83af8be17b3fa41447f2b4c19abdb5e18 100644 (file)
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -3,13 +3,23 @@ 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
        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
+       help
+         Say 'Y' here if you want your kernel to support boards based
+         on the Marvell Armada XP SoC with device tree.
 
 endmenu