From: Jon Medhurst <tixy@linaro.org>
Date: Wed, 17 Jul 2013 11:02:16 +0000 (+0100)
Subject: Merge branch 'tracking-armlt-tc2-pm' into lsk-3.10-vexpress
X-Git-Tag: firefly_0821_release~3680^2~236^2^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3138d553f9181ecdaae3a7cfce6e8e1270f7cdcc;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	arch/arm/mach-vexpress/Makefile
---

3138d553f9181ecdaae3a7cfce6e8e1270f7cdcc
diff --cc arch/arm/mach-vexpress/Kconfig
index cca811c4b65a,d8b86861a7d0..83c1a9b92598
--- a/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 c298f7c0799c,fd9bcfd74316..c9ae195cc138
--- a/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