diff options
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/Kconfig.arm | 2 | ||||
| -rw-r--r-- | drivers/cpufreq/intel_pstate.c | 3 | ||||
| -rw-r--r-- | drivers/cpufreq/s5pv210-cpufreq.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm index 8c5cf4bdeab8..28c666c80149 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm | |||
| @@ -77,7 +77,7 @@ config ARM_EXYNOS5440_CPUFREQ | |||
| 77 | 77 | ||
| 78 | config ARM_EXYNOS_CPU_FREQ_BOOST_SW | 78 | config ARM_EXYNOS_CPU_FREQ_BOOST_SW |
| 79 | bool "EXYNOS Frequency Overclocking - Software" | 79 | bool "EXYNOS Frequency Overclocking - Software" |
| 80 | depends on ARM_EXYNOS_CPUFREQ | 80 | depends on ARM_EXYNOS_CPUFREQ && THERMAL |
| 81 | select CPU_FREQ_BOOST_SW | 81 | select CPU_FREQ_BOOST_SW |
| 82 | select EXYNOS_THERMAL | 82 | select EXYNOS_THERMAL |
| 83 | help | 83 | help |
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index c5eac949760d..e396ad3f8f3f 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c | |||
| @@ -660,6 +660,7 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = { | |||
| 660 | ICPU(0x3f, core_params), | 660 | ICPU(0x3f, core_params), |
| 661 | ICPU(0x45, core_params), | 661 | ICPU(0x45, core_params), |
| 662 | ICPU(0x46, core_params), | 662 | ICPU(0x46, core_params), |
| 663 | ICPU(0x4c, byt_params), | ||
| 663 | ICPU(0x4f, core_params), | 664 | ICPU(0x4f, core_params), |
| 664 | ICPU(0x56, core_params), | 665 | ICPU(0x56, core_params), |
| 665 | {} | 666 | {} |
| @@ -688,7 +689,7 @@ static int intel_pstate_init_cpu(unsigned int cpunum) | |||
| 688 | 689 | ||
| 689 | add_timer_on(&cpu->timer, cpunum); | 690 | add_timer_on(&cpu->timer, cpunum); |
| 690 | 691 | ||
| 691 | pr_info("Intel pstate controlling: cpu %d\n", cpunum); | 692 | pr_debug("Intel pstate controlling: cpu %d\n", cpunum); |
| 692 | 693 | ||
| 693 | return 0; | 694 | return 0; |
| 694 | } | 695 | } |
diff --git a/drivers/cpufreq/s5pv210-cpufreq.c b/drivers/cpufreq/s5pv210-cpufreq.c index 9a68225a757e..3f9791f07b8e 100644 --- a/drivers/cpufreq/s5pv210-cpufreq.c +++ b/drivers/cpufreq/s5pv210-cpufreq.c | |||
| @@ -501,7 +501,7 @@ static int check_mem_type(void __iomem *dmc_reg) | |||
| 501 | return val >> 8; | 501 | return val >> 8; |
| 502 | } | 502 | } |
| 503 | 503 | ||
| 504 | static int __init s5pv210_cpu_init(struct cpufreq_policy *policy) | 504 | static int s5pv210_cpu_init(struct cpufreq_policy *policy) |
| 505 | { | 505 | { |
| 506 | unsigned long mem_type; | 506 | unsigned long mem_type; |
| 507 | int ret; | 507 | int ret; |