Merge branch 'tracking-armlt-tc2-pm' into lsk-3.10-vexpress

Conflicts:
	arch/arm/mach-vexpress/Makefile

diff --cc arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
Simple merge

diff --cc arch/arm/kernel/setup.c
Simple merge

diff --cc arch/arm/mach-vexpress/Kconfig
index cca811c4b65a6c9974018dc2126e217392b020cd,d8b86861a7d0ab03cac97aadb9d6f51f8df3ac22..83c1a9b92598126fce2cda1227dded65d8c10c1e
--- 1/arch/arm/mach-vexpress/Kconfig
--- 2/arch/arm/mach-vexpress/Kconfig
+++ b/arch/arm/mach-vexpress/Kconfig
@@@ -56,15 -56,13 +56,23 @@@ config ARCH_VEXPRESS_CORTEX_A5_A9_ERRAT
  
  config ARCH_VEXPRESS_CA9X4
        bool "Versatile Express Cortex-A9x4 tile"
 +      select ARM_ERRATA_643719
 +
 +config ARCH_VEXPRESS_DCSCB
 +      bool "Dual Cluster System Control Block (DCSCB) support"
 +      depends on MCPM
 +      select ARM_CCI
 +      help
 +        Support for the Dual Cluster System Configuration Block (DCSCB).
 +        This is needed to provide CPU and cluster power management
 +        on RTSM implementing big.LITTLE.
  
+ config ARCH_VEXPRESS_TC2
+       bool "TC2 cluster management"
+       depends on MCPM
+       select VEXPRESS_SPC
+       select ARM_CCI
+       help
+         Support for CPU and cluster power management on TC2.
+ 
  endmenu

diff --cc arch/arm/mach-vexpress/Makefile
index c298f7c0799c66637ce8284ebb2ed23b947f8279,fd9bcfd74316d1222a518001ea82dd9d0386d3b2..c9ae195cc13842a4ab0325ef6d6e8052fa780e10
--- 1/arch/arm/mach-vexpress/Makefile
--- 2/arch/arm/mach-vexpress/Makefile
+++ b/arch/arm/mach-vexpress/Makefile
@@@ -6,7 -6,7 +6,9 @@@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) :
  
  obj-y                                 := v2m.o
  obj-$(CONFIG_ARCH_VEXPRESS_CA9X4)     += ct-ca9x4.o
 +obj-$(CONFIG_ARCH_VEXPRESS_DCSCB)     += dcscb.o      dcscb_setup.o
 +CFLAGS_REMOVE_dcscb.o                 = -pg
+ obj-$(CONFIG_ARCH_VEXPRESS_TC2)               += tc2_pm.o tc2_pm_setup.o
+ CFLAGS_REMOVE_tc2_pm.o                        = -pg
  obj-$(CONFIG_SMP)                     += platsmp.o
  obj-$(CONFIG_HOTPLUG_CPU)             += hotplug.o