Merge tag 'renesas-fixes-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / cpufreq / Kconfig.arm

diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index a0b3661d90b0e9bcb8a9d4bfe3d3553b61518fff..030ddf6dd3f1456e70d8cd7b273e3c21b57f35ce 100644 (file)
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -21,8 +21,8 @@ config ARM_S3C2416_CPUFREQ
          If in doubt, say N.
 
 config ARM_S3C2416_CPUFREQ_VCORESCALE
-       bool "Allow voltage scaling for S3C2416 arm core (EXPERIMENTAL)"
-       depends on ARM_S3C2416_CPUFREQ && REGULATOR && EXPERIMENTAL
+       bool "Allow voltage scaling for S3C2416 arm core"
+       depends on ARM_S3C2416_CPUFREQ && REGULATOR
        help
          Enable CPU voltage scaling when entering the dvs mode.
          It uses information gathered through existing hardware and
@@ -77,9 +77,39 @@ config ARM_EXYNOS5250_CPUFREQ
          This adds the CPUFreq driver for Samsung EXYNOS5250
          SoC.
 
+config ARM_KIRKWOOD_CPUFREQ
+       def_bool ARCH_KIRKWOOD && OF
+       help
+         This adds the CPUFreq driver for Marvell Kirkwood
+         SoCs.
+
+config ARM_IMX6Q_CPUFREQ
+       tristate "Freescale i.MX6Q cpufreq support"
+       depends on SOC_IMX6Q
+       depends on REGULATOR_ANATOP
+       help
+         This adds cpufreq driver support for Freescale i.MX6Q SOC.
+
+         If in doubt, say N.
+
 config ARM_SPEAR_CPUFREQ
        bool "SPEAr CPUFreq support"
        depends on PLAT_SPEAR
        default y
        help
          This adds the CPUFreq driver support for SPEAr SOCs.
+
+config ARM_HIGHBANK_CPUFREQ
+       tristate "Calxeda Highbank-based"
+       depends on ARCH_HIGHBANK
+       select CPU_FREQ_TABLE
+       select GENERIC_CPUFREQ_CPU0
+       select PM_OPP
+       select REGULATOR
+
+       default m
+       help
+         This adds the CPUFreq driver for Calxeda Highbank SoC
+         based boards.
+
+         If in doubt, say N.