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

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

diff --cc arch/arm64/Kconfig
index a6633c6b9c5ddde183fa6ffeb9536d483ec75748,7583fd42851cd18e86cbc1e11e27cccdc433e8d3..c2dccc54f70141175358a8a83d5719de51a53edb
--- 1/arch/arm64/Kconfig
--- 2/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 8327444b76cb58abaa0d22e9f6c3bf192f66fda0,2378a52e1504932dc8fd31211a706c8aa01fa696..22727792350bb913c3be5ba843b7b526150e83c1
--- 1/drivers/cpufreq/Kconfig.arm
--- 2/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.