From: Jason Cooper <jason@lakedaemon.net>
Date: Sat, 1 Mar 2014 03:21:04 +0000 (+0000)
Subject: Merge branch 'mvebu/soc-kw' into mvebu/soc
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0d75ab68fd1a516f7a394fac6ba0f0ef34bbd18e;p=deliverable%2Flinux.git

Merge branch 'mvebu/soc-kw' into mvebu/soc
---

0d75ab68fd1a516f7a394fac6ba0f0ef34bbd18e
diff --cc arch/arm/mach-mvebu/Kconfig
index 4b1eea09ae93,5e533612e734..4cfc4d8abcac
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@@ -26,50 -26,21 +26,50 @@@ config MACH_MVEBU_V
  	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 NEON
 +	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 NEON
 +	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
diff --cc arch/arm/mach-mvebu/Makefile
index 2c1db29db2ca,a903f8ad8a4a..bbeb41ee3e75
--- a/arch/arm/mach-mvebu/Makefile
+++ b/arch/arm/mach-mvebu/Makefile
@@@ -3,8 -3,9 +3,10 @@@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) :
  
  AFLAGS_coherency_ll.o		:= -Wa,-march=armv7-a
  
 -obj-y				 += coherency.o coherency_ll.o pmsu.o system-controller.o mvebu-soc-id.o
 -obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o
 +obj-y				 += system-controller.o mvebu-soc-id.o
 +obj-$(CONFIG_MACH_MVEBU_V7)      += board-v7.o
 +obj-$(CONFIG_ARCH_MVEBU)	 += coherency.o coherency_ll.o pmsu.o
  obj-$(CONFIG_SMP)                += platsmp.o headsmp.o
  obj-$(CONFIG_HOTPLUG_CPU)        += hotplug.o
+ obj-$(CONFIG_MACH_KIRKWOOD)	 += kirkwood.o kirkwood-pm.o
+ obj-$(CONFIG_MACH_T5325)	 += board-t5325.o