diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-11 15:37:25 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-11 15:37:25 +0200 |
commit | 3e66c4b86035884e00f008086b183b925fb0592b (patch) | |
tree | d6643e279be41263837be75c420a7be7b63eb5b4 /drivers/cpufreq/Kconfig.arm | |
parent | 7c976664d537bca19c9bf892b4d9e5ab7ecea927 (diff) | |
parent | 74da56ce5c6715630aed3ccc0fcb86a9210c1a56 (diff) | |
download | linux-3e66c4b86035884e00f008086b183b925fb0592b.tar.bz2 |
Merge branch 'pm-cpufreq'
* pm-cpufreq:
intel_pstate: fix PCT_TO_HWP macro
intel_pstate: Fix user input of min/max to legal policy region
cpufreq-dt: add suspend frequency support
cpufreq: allow cpufreq_generic_suspend() to work without suspend frequency
cpufreq: Use __func__ to print function's name
cpufreq: staticize cpufreq_cpu_get_raw()
cpufreq: Add ARM_MT8173_CPUFREQ dependency on THERMAL
cpufreq: dt: Tolerance applies on both sides of target voltage
cpufreq: dt: Print error on failing to mark OPPs as shared
cpufreq: dt: Check OPP count before marking them shared
Diffstat (limited to 'drivers/cpufreq/Kconfig.arm')
-rw-r--r-- | drivers/cpufreq/Kconfig.arm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm index 77aa34eae92c..c4c6200be435 100644 --- 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. |