From: Mark Brown <broonie@linaro.org>
Date: Tue, 27 May 2014 16:25:03 +0000 (+0100)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/arm64-bl-cpufreq' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~117^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=74d3aa5b4835831233251c99715e8e12aa9b0c1f;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'lsk/v3.10/topic/arm64-bl-cpufreq' into linux-linaro-lsk

Conflicts:
	arch/arm64/Kconfig
	drivers/cpufreq/Kconfig.arm
---

74d3aa5b4835831233251c99715e8e12aa9b0c1f
diff --cc arch/arm64/Kconfig
index a6633c6b9c5d,7583fd42851c..c2dccc54f701
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -1,8 -1,7 +1,9 @@@
  config ARM64
  	def_bool y
  	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 +	select ARCH_USE_CMPXCHG_LOCKREF
+ 	select ARCH_HAS_OPP
 +	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
  	select ARCH_WANT_OPTIONAL_GPIOLIB
  	select ARCH_WANT_COMPAT_IPC_PARSE_VERSION
  	select ARCH_WANT_FRAME_POINTERS
diff --cc drivers/cpufreq/Kconfig.arm
index 8327444b76cb,2378a52e1504..22727792350b
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@@ -4,7 -4,8 +4,8 @@@
  
  config ARM_BIG_LITTLE_CPUFREQ
  	tristate "Generic ARM big LITTLE CPUfreq driver"
- 	depends on ARM_CPU_TOPOLOGY && PM_OPP && HAVE_CLK && BIG_LITTLE
 -	depends on ARM_CPU_TOPOLOGY || (ARM64 && SMP)
++	depends on (ARM_CPU_TOPOLOGY && BIG_LITTLE) || (ARM64 && SMP)
+ 	depends on PM_OPP && HAVE_CLK
  	help
  	  This enables the Generic CPUfreq driver for ARM big.LITTLE platforms.