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

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

Merge branch 'pm-cpufreq-fixes' into pm-fixes 

* pm-cpufreq-fixes:
  intel_pstate: fix no_turbo
  cpufreq: cpufreq-cpu0: NULL is a valid regulator, part 2
  cpufreq: SPEAr: Fix incorrect variable type
parents aab17289 1ccf7a1c

drivers/cpufreq/cpufreq-cpu0.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev) 
	if (of_property_read_u32(np, "clock-latency", &transition_latency))

		transition_latency = CPUFREQ_ETERNAL;



	if (cpu_reg) {

	if (!IS_ERR(cpu_reg)) {

		struct opp *opp;

		unsigned long min_uV, max_uV;

		int i;

drivers/cpufreq/intel_pstate.c

+4 −1
Original line number Diff line number Diff line
@@ -394,6 +394,9 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate) 
	trace_cpu_frequency(pstate * 100000, cpu->cpu);



	cpu->pstate.current_pstate = pstate;

	if (limits.no_turbo)

		wrmsrl(MSR_IA32_PERF_CTL, BIT(32) | (pstate << 8));

	else

		wrmsrl(MSR_IA32_PERF_CTL, pstate << 8);



}

drivers/cpufreq/spear-cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static int spear_cpufreq_target(struct cpufreq_policy *policy, 
		unsigned int target_freq, unsigned int relation)

{

	struct cpufreq_freqs freqs;

	unsigned long newfreq;

	long newfreq;

	struct clk *srcclk;

	int index, ret, mult = 1;