diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-04-14 23:13:53 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-04-14 23:13:53 +0200 |
| commit | 2c127c46ec98ff0f1cdb236321bdd54e6e43fcf5 (patch) | |
| tree | a8dadc4c550744fe2aa0ba6ae46f5ae9c0bcbb67 | |
| parent | 8f3d9f354286745c751374f5f1fcafee6b3f3136 (diff) | |
| parent | aca48b61f963869ccbb5cf84805a7ad68bf812cd (diff) | |
| download | linux-2c127c46ec98ff0f1cdb236321bdd54e6e43fcf5.tar.gz | |
Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm
Merge an operating performance points (OPP) framework update for
5.7-rc2 from Viresh Kumar:
"This contains a single patch that lets the OPP core to be used by
several IO drivers without making a lot of changes in them for the
case where the same driver may be used by a platform with an OPP
table or a clock node on another one. I am looking to get this into
5.7 release itself, which will enable other users (in multiple
frameworks) to get merged without waiting for the dependency to get
resolved."
* 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
opp: Manage empty OPP tables with clk handle
| -rw-r--r-- | drivers/opp/core.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/opp/core.c b/drivers/opp/core.c index ba43e6a3dc0aee..e4f01e7771a223 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -819,6 +819,8 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq) if (unlikely(!target_freq)) { if (opp_table->required_opp_tables) { ret = _set_required_opps(dev, opp_table, NULL); + } else if (!_get_opp_count(opp_table)) { + return 0; } else { dev_err(dev, "target frequency can't be 0\n"); ret = -EINVAL; @@ -849,6 +851,18 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq) goto put_opp_table; } + /* + * For IO devices which require an OPP on some platforms/SoCs + * while just needing to scale the clock on some others + * we look for empty OPP tables with just a clock handle and + * scale only the clk. This makes dev_pm_opp_set_rate() + * equivalent to a clk_set_rate() + */ + if (!_get_opp_count(opp_table)) { + ret = _generic_set_opp_clk_only(dev, clk, freq); + goto put_opp_table; + } + temp_freq = old_freq; old_opp = _find_freq_ceil(opp_table, &temp_freq); if (IS_ERR(old_opp)) { |