Merge tag 'mvebu-soc-3.15-2' of git://git.infradead.org/linux-mvebu into next/soc

Merge "mvebu soc changes for v3.15 (incremental pull #2)" from Jason Cooper:

 - mvebu
    - Add Armada 375, 380 and 385 SoCs

 - kirkwood
    - move kirkwood DT support to mach-mvebu
    - add mostly DT support for HP T5325 thin client

* tag 'mvebu-soc-3.15-2' of git://git.infradead.org/linux-mvebu:
  ARM: kirkwood: Add HP T5325 thin client
  ARM: kirkwood: select dtbs based on SoC
  ARM: kirkwood: Remove redundant kexec code
  ARM: mvebu: Armada 375/38x depend on MULTI_V7
  ARM: mvebu: Simplify headers and make local
  ARM: mvebu: Enable mvebu-soc-id on Kirkwood
  ARM: mvebu: Let kirkwood use the system controller for restart
  ARM: mvebu: Move kirkwood DT boards into mach-mvebu
  ARM: MM Enable building Feroceon L2 cache controller with ARCH_MVEBU
  ARM: Fix default CPU selection for ARCH_MULTI_V5
  ARM: MM: Add DT binding for Feroceon L2 cache
  ARM: orion: Move cache-feroceon-l2.h out of plat-orion
  ARM: mvebu: Add ARCH_MULTI_V7 to SoCs
  ARM: kirkwood: ioremap memory control register
  ARM: kirkwood: ioremap the cpu_config register before using it.
  ARM: kirkwood: Separate board-dt from common and pcie code.
  ARM: kirkwood: Drop printing the SoC type and revision
  ARM: kirkwood: Convert mv88f6281gtw_ge switch setup to DT
  ARM: kirkwood: Give pm.c its own header file.
  ARM: mvebu: Rename the ARCH_MVEBU menu option

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 30 insertions, 6 deletions

diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index f961ae4ec4ee..dd35de74efab 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -1,5 +1,5 @@
 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 GENERIC_IRQ_CHIP
@@ -14,7 +14,7 @@ config ARCH_MVEBU
 
 if ARCH_MVEBU
 
-menu "Marvell SOC with device tree"
+menu "Marvell EBU SoC variants"
 
 config MACH_MVEBU_V7
         bool
@@ -22,7 +22,7 @@ config MACH_MVEBU_V7
         select CACHE_L2X0
 
 config MACH_ARMADA_370
-        bool "Marvell Armada 370 boards"
+        bool "Marvell Armada 370 boards" if ARCH_MULTI_V7
         select ARMADA_370_CLK
         select CPU_PJ4B
         select MACH_MVEBU_V7
@@ -32,7 +32,7 @@ config MACH_ARMADA_370
           on the Marvell Armada 370 SoC with device tree.
 
 config MACH_ARMADA_375
-        bool "Marvell Armada 375 boards"
+        bool "Marvell Armada 375 boards" if ARCH_MULTI_V7
         select ARM_ERRATA_720789
         select ARM_ERRATA_753970
         select ARM_GIC
@@ -46,7 +46,7 @@ config MACH_ARMADA_375
           on the Marvell Armada 375 SoC with device tree.
 
 config MACH_ARMADA_38X
-        bool "Marvell Armada 380/385 boards"
+        bool "Marvell Armada 380/385 boards" if ARCH_MULTI_V7
         select ARM_ERRATA_720789
         select ARM_ERRATA_753970
         select ARM_GIC
@@ -60,7 +60,7 @@ config MACH_ARMADA_38X
           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 CPU_PJ4B
         select MACH_MVEBU_V7
@@ -69,6 +69,30 @@ config MACH_ARMADA_XP
           Say 'Y' here if you want your kernel to support boards based
           on the Marvell Armada XP SoC with 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