Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e38ed294 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-sleep', 'pm-cpuidle' and 'pm-cpufreq' 

* pm-sleep:
  PM / suspend: Make cpuidle work in the "freeze" state

* pm-cpuidle:
  intel_idle: fix IVT idle state table setting

* pm-cpufreq:
  cpufreq: highbank: fix ARM_HIGHBANK_CPUFREQ dependency warning
  cpufreq: ppc: Fix integer overflow in expression
  cpufreq, powernv: Fix build failure on UP
  cpufreq: unicore32: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO
parents 1efa9f95 f3f12532 d27dca42 d76ae2ea

drivers/cpufreq/Kconfig.arm

+1 −5
Original line number Diff line number Diff line
@@ -92,11 +92,7 @@ config ARM_EXYNOS_CPU_FREQ_BOOST_SW 


config ARM_HIGHBANK_CPUFREQ

	tristate "Calxeda Highbank-based"

	depends on ARCH_HIGHBANK

	select GENERIC_CPUFREQ_CPU0

	select PM_OPP

	select REGULATOR



	depends on ARCH_HIGHBANK && GENERIC_CPUFREQ_CPU0 && REGULATOR

	default m

	help

	  This adds the CPUFreq driver for Calxeda Highbank SoC

drivers/cpufreq/powernv-cpufreq.c

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 


#include <asm/cputhreads.h>

#include <asm/reg.h>

#include <asm/smp.h> /* Required for cpu_sibling_mask() in UP configs */



#define POWERNV_MAX_PSTATES	256

drivers/cpufreq/ppc-corenet-cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ static int corenet_cpufreq_cpu_init(struct cpufreq_policy *policy) 
		per_cpu(cpu_data, i) = data;



	policy->cpuinfo.transition_latency =

				(12 * NSEC_PER_SEC) / fsl_get_sys_freq();

				(12ULL * NSEC_PER_SEC) / fsl_get_sys_freq();

	of_node_put(np);



	return 0;

drivers/cpufreq/unicore2-cpufreq.c

+1 −3
Original line number Diff line number Diff line
@@ -60,9 +60,7 @@ static int __init ucv2_cpu_init(struct cpufreq_policy *policy) 
	policy->max = policy->cpuinfo.max_freq = 1000000;

	policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;

	policy->clk = clk_get(NULL, "MAIN_CLK");

	if (IS_ERR(policy->clk))

		return PTR_ERR(policy->clk);

	return 0;

	return PTR_ERR_OR_ZERO(policy->clk);

}



static struct cpufreq_driver ucv2_driver = {

drivers/idle/intel_idle.c

+2 −1
Original line number Diff line number Diff line
@@ -750,11 +750,12 @@ void intel_idle_state_table_update(void) 
			if (package_num + 1 > num_sockets) {

				num_sockets = package_num + 1;



				if (num_sockets > 4)

				if (num_sockets > 4) {

					cpuidle_state_table = ivt_cstates_8s;

					return;

				}

			}

		}



		if (num_sockets > 2)

			cpuidle_state_table = ivt_cstates_4s;