Merge branch 'pm-cpufreq'

[cascardo/linux.git] / drivers / cpufreq / Kconfig.arm

diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index 2bacf24..c4c6200 100644 (file)
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -133,6 +133,7 @@ config ARM_KIRKWOOD_CPUFREQ
 config ARM_MT8173_CPUFREQ
        bool "Mediatek MT8173 CPUFreq support"
        depends on ARCH_MEDIATEK && REGULATOR
+       depends on !CPU_THERMAL || THERMAL=y
        select PM_OPP
        help
          This adds the CPUFreq driver support for Mediatek MT8173 SoC.
@@ -254,12 +255,19 @@ config ARM_SPEAR_CPUFREQ
        help
          This adds the CPUFreq driver support for SPEAr SOCs.
 
-config ARM_TEGRA_CPUFREQ
-       bool "TEGRA CPUFreq support"
+config ARM_TEGRA20_CPUFREQ
+       bool "Tegra20 CPUFreq support"
        depends on ARCH_TEGRA
        default y
        help
-         This adds the CPUFreq driver support for TEGRA SOCs.
+         This adds the CPUFreq driver support for Tegra20 SOCs.
+
+config ARM_TEGRA124_CPUFREQ
+       tristate "Tegra124 CPUFreq support"
+       depends on ARCH_TEGRA && CPUFREQ_DT
+       default y
+       help
+         This adds the CPUFreq driver support for Tegra124 SOCs.
 
 config ARM_PXA2xx_CPUFREQ
        tristate "Intel PXA2xx CPUfreq driver"