Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android' into...

[firefly-linux-kernel-4.4.55.git] / drivers / cpufreq / Kconfig.arm

diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index 6e57543fe0b981e55cfdd9623c5eb1ed910ffd8c..8327444b76cb58abaa0d22e9f6c3bf192f66fda0 100644 (file)
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -4,7 +4,7 @@
 
 config ARM_BIG_LITTLE_CPUFREQ
        tristate "Generic ARM big LITTLE CPUfreq driver"
-       depends on ARM_CPU_TOPOLOGY && PM_OPP && HAVE_CLK
+       depends on ARM_CPU_TOPOLOGY && PM_OPP && HAVE_CLK && BIG_LITTLE
        help
          This enables the Generic CPUfreq driver for ARM big.LITTLE platforms.
 
@@ -15,6 +15,14 @@ config ARM_DT_BL_CPUFREQ
          This enables probing via DT for Generic CPUfreq driver for ARM
          big.LITTLE platform. This gets frequency tables from DT.
 
+config ARM_VEXPRESS_BL_CPUFREQ
+       tristate "ARM Vexpress big LITTLE CPUfreq driver"
+       select ARM_BIG_LITTLE_CPUFREQ
+       depends on VEXPRESS_SPC
+       help
+         This enables the CPUfreq driver for ARM Vexpress big.LITTLE platform.
+         If in doubt, say N.
+
 config ARM_EXYNOS_CPUFREQ
        bool "SAMSUNG EXYNOS SoCs"
        depends on ARCH_EXYNOS