1 files changed, 72 insertions, 14 deletions

diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index 5e269d7263ce..3f73eecbcfb0 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -1,51 +1,109 @@
 config ARCH_MVEBU
-        bool "Marvell SOCs with Device Tree support" if ARCH_MULTI_V7
+        bool "Marvell Engineering Business Unit (MVEBU) SoCs" if (ARCH_MULTI_V7 || ARCH_MULTI_V5)
         select ARCH_SUPPORTS_BIG_ENDIAN
         select CLKSRC_MMIO
-        select COMMON_CLK
-        select GENERIC_CLOCKEVENTS
         select GENERIC_IRQ_CHIP
         select IRQ_DOMAIN
-        select MULTI_IRQ_HANDLER
         select PINCTRL
         select PLAT_ORION
-        select SPARSE_IRQ
-        select CLKDEV_LOOKUP
         select MVEBU_MBUS
         select ZONE_DMA if ARM_LPAE
         select ARCH_REQUIRE_GPIOLIB
         select MIGHT_HAVE_PCI
         select PCI_QUIRKS if PCI
+        select OF_ADDRESS_PCI
 
 if ARCH_MVEBU
 
-menu "Marvell SOC with device tree"
+menu "Marvell EBU SoC variants"
 
-config MACH_ARMADA_370_XP
+config MACH_MVEBU_V7
         bool
         select ARMADA_370_XP_TIMER
-        select HAVE_SMP
         select CACHE_L2X0
-        select CPU_PJ4B
 
 config MACH_ARMADA_370
-        bool "Marvell Armada 370 boards"
+        bool "Marvell Armada 370 boards" if ARCH_MULTI_V7
         select ARMADA_370_CLK
-        select MACH_ARMADA_370_XP
+        select CPU_PJ4B
+        select MACH_MVEBU_V7
         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.
 
+config MACH_ARMADA_375
+        bool "Marvell Armada 375 boards" if ARCH_MULTI_V7
+        select ARM_ERRATA_720789
+        select ARM_ERRATA_753970
+        select ARM_GIC
+        select ARMADA_375_CLK
+        select CPU_V7
+        select MACH_MVEBU_V7
+        select PINCTRL_ARMADA_375
+        help
+          Say 'Y' here if you want your kernel to support boards based
+          on the Marvell Armada 375 SoC with device tree.
+
+config MACH_ARMADA_38X
+        bool "Marvell Armada 380/385 boards" if ARCH_MULTI_V7
+        select ARM_ERRATA_720789
+        select ARM_ERRATA_753970
+        select ARM_GIC
+        select ARMADA_38X_CLK
+        select CPU_V7
+        select MACH_MVEBU_V7
+        select PINCTRL_ARMADA_38X
+        help
+          Say 'Y' here if you want your kernel to support boards based
+          on the Marvell Armada 380/385 SoC with device tree.
+
 config MACH_ARMADA_XP
-        bool "Marvell Armada XP boards"
+        bool "Marvell Armada XP boards" if ARCH_MULTI_V7
         select ARMADA_XP_CLK
-        select MACH_ARMADA_370_XP
+        select CPU_PJ4B
+        select MACH_MVEBU_V7
         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.
 
+config MACH_DOVE
+        bool "Marvell Dove boards" if ARCH_MULTI_V7
+        select CACHE_L2X0
+        select CPU_PJ4
+        select DOVE_CLK
+        select ORION_IRQCHIP
+        select ORION_TIMER
+        select PINCTRL_DOVE
+        help
+          Say 'Y' here if you want your kernel to support the
+          Marvell Dove using flattened device tree.
+
+config MACH_KIRKWOOD
+        bool "Marvell Kirkwood boards" if ARCH_MULTI_V5
+        select ARCH_HAS_CPUFREQ
+        select ARCH_REQUIRE_GPIOLIB
+        select CPU_FEROCEON
+        select KIRKWOOD_CLK
+        select OF_IRQ
+        select ORION_IRQCHIP
+        select ORION_TIMER
+        select PCI
+        select PCI_QUIRKS
+        select PINCTRL_KIRKWOOD
+        select USE_OF
+        help
+          Say 'Y' here if you want your kernel to support boards based
+          on the Marvell Kirkwood device tree.
+
+config MACH_T5325
+        bool "HP T5325 thin client"
+        depends on MACH_KIRKWOOD
+        help
+          Say 'Y' here if you want your kernel to support the
+          HP T5325 Thin client
+
 endmenu
 
 endif