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

Merge branch 'tracking-armlt-dcscb' into lsk-3.10-vexpress
---

08f87fd1f8d4c4bb7bc2473e63e01841997575a0
diff --cc arch/arm/mach-vexpress/Kconfig
index fe637e90cdb0,b8bbabec6310..cca811c4b65a
--- a/arch/arm/mach-vexpress/Kconfig
+++ b/arch/arm/mach-vexpress/Kconfig
@@@ -56,6 -56,14 +56,15 @@@ 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.
+ 
  endmenu