From: Viresh Kumar <viresh.kumar@linaro.org>
To: Rafael Wysocki <rjw@rjwysocki.net>
Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org,
Stephen Boyd <sboyd@codeaurora.org>,
nm@ti.com, Viresh Kumar <viresh.kumar@linaro.org>,
open list <linux-kernel@vger.kernel.org>
Subject: [PATCH V3 14/16] cpufreq: dt: Use dev_pm_opp_set_rate() to switch frequency
Date: Tue, 9 Feb 2016 10:30:46 +0530 [thread overview]
Message-ID: <29ed9d51c47e5a95b53c617508d5bcbb1cbd44eb.1454992187.git.viresh.kumar@linaro.org> (raw)
In-Reply-To: <cover.1454992186.git.viresh.kumar@linaro.org>
In-Reply-To: <cover.1454992186.git.viresh.kumar@linaro.org>
OPP core supports frequency/voltage changes based on the target
frequency now, use that instead of open coding the same in cpufreq-dt
driver.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
---
drivers/cpufreq/cpufreq-dt.c | 73 ++------------------------------------------
1 file changed, 2 insertions(+), 71 deletions(-)
diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
index 6f80ce56b4ec..150a172c7d0a 100644
--- a/drivers/cpufreq/cpufreq-dt.c
+++ b/drivers/cpufreq/cpufreq-dt.c
@@ -45,79 +45,10 @@ static struct freq_attr *cpufreq_dt_attr[] = {
static int set_target(struct cpufreq_policy *policy, unsigned int index)
{
- struct dev_pm_opp *opp;
- struct cpufreq_frequency_table *freq_table = policy->freq_table;
- struct clk *cpu_clk = policy->clk;
struct private_data *priv = policy->driver_data;
- struct device *cpu_dev = priv->cpu_dev;
- struct regulator *cpu_reg = priv->cpu_reg;
- unsigned long volt = 0, tol = 0;
- int volt_old = 0;
- unsigned int old_freq, new_freq;
- long freq_Hz, freq_exact;
- int ret;
-
- freq_Hz = clk_round_rate(cpu_clk, freq_table[index].frequency * 1000);
- if (freq_Hz <= 0)
- freq_Hz = freq_table[index].frequency * 1000;
-
- freq_exact = freq_Hz;
- new_freq = freq_Hz / 1000;
- old_freq = clk_get_rate(cpu_clk) / 1000;
-
- if (!IS_ERR(cpu_reg)) {
- unsigned long opp_freq;
-
- rcu_read_lock();
- opp = dev_pm_opp_find_freq_ceil(cpu_dev, &freq_Hz);
- if (IS_ERR(opp)) {
- rcu_read_unlock();
- dev_err(cpu_dev, "failed to find OPP for %ld\n",
- freq_Hz);
- return PTR_ERR(opp);
- }
- volt = dev_pm_opp_get_voltage(opp);
- opp_freq = dev_pm_opp_get_freq(opp);
- rcu_read_unlock();
- tol = volt * priv->voltage_tolerance / 100;
- volt_old = regulator_get_voltage(cpu_reg);
- dev_dbg(cpu_dev, "Found OPP: %ld kHz, %ld uV\n",
- opp_freq / 1000, volt);
- }
-
- dev_dbg(cpu_dev, "%u MHz, %d mV --> %u MHz, %ld mV\n",
- old_freq / 1000, (volt_old > 0) ? volt_old / 1000 : -1,
- new_freq / 1000, volt ? volt / 1000 : -1);
-
- /* scaling up? scale voltage before frequency */
- if (!IS_ERR(cpu_reg) && new_freq > old_freq) {
- ret = regulator_set_voltage_tol(cpu_reg, volt, tol);
- if (ret) {
- dev_err(cpu_dev, "failed to scale voltage up: %d\n",
- ret);
- return ret;
- }
- }
-
- ret = clk_set_rate(cpu_clk, freq_exact);
- if (ret) {
- dev_err(cpu_dev, "failed to set clock rate: %d\n", ret);
- if (!IS_ERR(cpu_reg) && volt_old > 0)
- regulator_set_voltage_tol(cpu_reg, volt_old, tol);
- return ret;
- }
- /* scaling down? scale voltage after frequency */
- if (!IS_ERR(cpu_reg) && new_freq < old_freq) {
- ret = regulator_set_voltage_tol(cpu_reg, volt, tol);
- if (ret) {
- dev_err(cpu_dev, "failed to scale voltage down: %d\n",
- ret);
- clk_set_rate(cpu_clk, old_freq * 1000);
- }
- }
-
- return ret;
+ return dev_pm_opp_set_rate(priv->cpu_dev,
+ policy->freq_table[index].frequency * 1000);
}
/*
--
2.7.1.370.gb2aa7f8
next prev parent reply other threads:[~2016-02-09 5:00 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-09 5:00 [PATCH V3 00/16] PM / OPP: Introduce APIs to transition OPPs Viresh Kumar
2016-02-09 5:00 ` [PATCH V3 01/16] PM / OPP: get/put regulators from OPP core Viresh Kumar
2016-02-09 19:04 ` Stephen Boyd
2016-02-09 5:00 ` [PATCH V3 02/16] PM / OPP: Disable OPPs that aren't supported by the regulator Viresh Kumar
2016-02-09 5:00 ` [PATCH V3 03/16] PM / OPP: Introduce dev_pm_opp_get_max_volt_latency() Viresh Kumar
2016-02-09 19:04 ` Stephen Boyd
2016-02-09 5:00 ` [PATCH V3 04/16] PM / OPP: Introduce dev_pm_opp_get_max_transition_latency() Viresh Kumar
2016-02-09 5:00 ` [PATCH V3 05/16] PM / OPP: Parse clock-latency and voltage-tolerance for v1 bindings Viresh Kumar
2016-02-09 5:00 ` [PATCH V3 06/16] PM / OPP: Manage device clk Viresh Kumar
2016-02-09 5:00 ` [PATCH V3 07/16] PM / OPP: Add dev_pm_opp_set_rate() Viresh Kumar
2016-02-09 19:06 ` Stephen Boyd
2016-02-09 5:00 ` [PATCH V3 08/16] cpufreq: dt: Convert few pr_debug/err() calls to dev_dbg/err() Viresh Kumar
2016-02-09 5:00 ` [PATCH V3 09/16] cpufreq: dt: Rename 'need_update' to 'opp_v1' Viresh Kumar
2016-02-09 5:00 ` [PATCH V3 10/16] cpufreq: dt: OPP layers handles clock-latency for V1 bindings as well Viresh Kumar
2016-02-09 5:00 ` [PATCH V3 11/16] cpufreq: dt: Pass regulator name to the OPP core Viresh Kumar
2016-02-09 19:07 ` Stephen Boyd
2018-07-17 7:46 ` Geert Uytterhoeven
2018-07-18 5:50 ` Viresh Kumar
2018-07-18 7:09 ` Geert Uytterhoeven
2018-07-18 7:16 ` Viresh Kumar
2016-02-09 5:00 ` [PATCH V3 12/16] cpufreq: dt: Unsupported OPPs are already disabled Viresh Kumar
2016-02-09 5:00 ` [PATCH V3 13/16] cpufreq: dt: Reuse dev_pm_opp_get_max_transition_latency() Viresh Kumar
2016-02-09 5:00 ` Viresh Kumar [this message]
2016-02-09 5:00 ` [PATCH V3 15/16] cpufreq: dt: No need to fetch voltage-tolerance Viresh Kumar
2016-02-09 5:00 ` [PATCH V3 16/16] cpufreq: dt: No need to allocate resources anymore Viresh Kumar
2016-02-09 19:09 ` Stephen Boyd
2016-02-11 21:19 ` [PATCH V3 00/16] PM / OPP: Introduce APIs to transition OPPs Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=29ed9d51c47e5a95b53c617508d5bcbb1cbd44eb.1454992187.git.viresh.kumar@linaro.org \
--to=viresh.kumar@linaro.org \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=nm@ti.com \
--cc=rjw@rjwysocki.net \
--cc=sboyd@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).