Merge branch 'mvebu/soc' into for-next

diff --cc arch/arm/mach-mvebu/Makefile
index ec0b2177d991aa03c42af0a17e1ccfa9ff15249e,6f2a063f05d8bb81eb6fcfe6e468cc72a7835f01..854b72af9faaf5c2476e68df3a41c3dd535c5c01
--- 1/arch/arm/mach-mvebu/Makefile
--- 2/arch/arm/mach-mvebu/Makefile
+++ b/arch/arm/mach-mvebu/Makefile
@@@ -3,14 -3,10 +3,13 @@@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) :
  
  AFLAGS_coherency_ll.o         := -Wa,-march=armv7-a
  
 -obj-y                          += system-controller.o mvebu-soc-id.o cpu-reset.o
 -obj-$(CONFIG_MACH_MVEBU_V7)      += board-v7.o
 +obj-y                          += system-controller.o mvebu-soc-id.o
 +
 +ifeq ($(CONFIG_MACH_MVEBU_V7),y)
 +obj-y                          += cpu-reset.o board-v7.o coherency.o coherency_ll.o pmsu.o
 +obj-$(CONFIG_SMP)              += platsmp.o headsmp.o platsmp-a9.o headsmp-a9.o
 +obj-$(CONFIG_HOTPLUG_CPU)      += hotplug.o
 +endif
 +
  obj-$(CONFIG_MACH_DOVE)                += dove.o
 -obj-$(CONFIG_ARCH_MVEBU)       += coherency.o coherency_ll.o pmsu.o
 -obj-$(CONFIG_SMP)                += platsmp.o headsmp.o platsmp-a9.o headsmp-a9.o
 -obj-$(CONFIG_HOTPLUG_CPU)        += hotplug.o
  obj-$(CONFIG_MACH_KIRKWOOD)    += kirkwood.o kirkwood-pm.o
- obj-$(CONFIG_MACH_T5325)       += board-t5325.o