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

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

Merge branch 'opp/linux-next' of... 

Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm into pm-opp

Pull operating performance points (OPP) framework updates for v5.1
from Viresh Kumar:

"This pull request contains following changes:

 - Introduced new OPP helper for power-estimation and used it in
   several cpufreq drivers (Quentin Perret, Matthias Kaehlcke, Dietmar
   Eggemann, and Yangtao Li).

 - OPP Debugfs cleanup (Greg KH).

 - OPP core cleanup (Viresh Kumar)."

* 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
  cpufreq: OMAP: Register an Energy Model
  cpufreq: imx6q: Register an Energy Model
  opp: no need to check return value of debugfs_create functions
  cpufreq: mediatek: Register an Energy Model
  cpufreq: scmi: Register an Energy Model
  cpufreq: arm_big_little: Register an Energy Model
  cpufreq: scpi: Register an Energy Model
  cpufreq: dt: Register an Energy Model
  PM / OPP: Introduce a power estimation helper
  PM / OPP: Remove unused parameter of _generic_set_opp_clk_only()
parents d1393711 a9a744dd

drivers/cpufreq/arm_big_little.c

+2 −0
Original line number Diff line number Diff line
@@ -487,6 +487,8 @@ static int bL_cpufreq_init(struct cpufreq_policy *policy) 
	policy->cpuinfo.transition_latency =

				arm_bL_ops->get_transition_latency(cpu_dev);



	dev_pm_opp_of_register_em(policy->cpus);



	if (is_bL_switching_enabled())

		per_cpu(cpu_last_req_freq, policy->cpu) = clk_get_cpu_rate(policy->cpu);

drivers/cpufreq/cpufreq-dt.c

+2 −0
Original line number Diff line number Diff line
@@ -280,6 +280,8 @@ static int cpufreq_init(struct cpufreq_policy *policy) 
	policy->cpuinfo.transition_latency = transition_latency;

	policy->dvfs_possible_from_any_cpu = true;



	dev_pm_opp_of_register_em(policy->cpus);



	return 0;



out_free_cpufreq_table:

drivers/cpufreq/imx6q-cpufreq.c

+1 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ static int imx6q_cpufreq_init(struct cpufreq_policy *policy) 
	policy->clk = clks[ARM].clk;

	ret = cpufreq_generic_init(policy, freq_table, transition_latency);

	policy->suspend_freq = max_freq;

	dev_pm_opp_of_register_em(policy->cpus);



	return ret;

}

drivers/cpufreq/mediatek-cpufreq.c

+2 −0
Original line number Diff line number Diff line
@@ -465,6 +465,8 @@ static int mtk_cpufreq_init(struct cpufreq_policy *policy) 
	policy->driver_data = info;

	policy->clk = info->cpu_clk;



	dev_pm_opp_of_register_em(policy->cpus);



	return 0;

}

drivers/cpufreq/omap-cpufreq.c

+3 −1
Original line number Diff line number Diff line
@@ -133,8 +133,10 @@ static int omap_cpu_init(struct cpufreq_policy *policy) 


	/* FIXME: what's the actual transition time? */

	result = cpufreq_generic_init(policy, freq_table, 300 * 1000);

	if (!result)

	if (!result) {

		dev_pm_opp_of_register_em(policy->cpus);

		return 0;

	}



	freq_table_free();

fail: