cpufreq: cpufreq_interactive: avoid NULL point access

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

diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index 8014c2307332cc803a73baec42c297c079d61974..927c23064cd8a604dba507c8c352dd20a2ee0718 100644 (file)
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -95,6 +95,15 @@ config ARM_OMAP2PLUS_CPUFREQ
        depends on ARCH_OMAP2PLUS
        default ARCH_OMAP2PLUS
 
+config ARM_ROCKCHIP_CPUFREQ
+       tristate "Rockchip CPUfreq driver"
+       depends on ARCH_ROCKCHIP && CPUFREQ_DT
+       select PM_OPP
+       help
+         This enables the rockchip CPUfreq driver.
+
+         If in doubt, say N.
+
 config ARM_S3C_CPUFREQ
        bool
        help
@@ -202,7 +211,7 @@ config ARM_SA1110_CPUFREQ
 
 config ARM_SCPI_CPUFREQ
         tristate "SCPI based CPUfreq driver"
-       depends on ARM_BIG_LITTLE_CPUFREQ && ARM_SCPI_PROTOCOL
+       depends on ARM_BIG_LITTLE_CPUFREQ && ARM_SCPI_PROTOCOL && COMMON_CLK_SCPI
         help
          This adds the CPUfreq driver support for ARM big.LITTLE platforms
          using SCPI protocol for CPU power management.
@@ -226,7 +235,7 @@ config ARM_TEGRA20_CPUFREQ
 
 config ARM_TEGRA124_CPUFREQ
        tristate "Tegra124 CPUFreq support"
-       depends on ARCH_TEGRA && CPUFREQ_DT
+       depends on ARCH_TEGRA && CPUFREQ_DT && REGULATOR
        default y
        help
          This adds the CPUFreq driver support for Tegra124 SOCs.