diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2022-07-04 21:07:28 +0530 |
|---|---|---|
| committer | Viresh Kumar <viresh.kumar@linaro.org> | 2022-07-12 20:35:21 +0530 |
| commit | 2f71ae1a9e75a675dfc9da03f5e191e858d1126f (patch) | |
| tree | 2952c168e9310f3e197dde3aa406319340c93fcf /drivers/opp | |
| parent | 8174a3a613af1a911ab19da812824f7180b261f9 (diff) | |
| download | linux-2f71ae1a9e75a675dfc9da03f5e191e858d1126f.tar.bz2 | |
OPP: Allow config_clks helper for single clk case
There is a corner case with Tegra30, where we want to skip clk
configuration via dev_pm_opp_set_opp(), but still want the OPP core to
read the "opp-hz" property so we can find the right OPP via freq finding
helpers.
This is the easiest of the ways to make it work, without any special
hacks in the OPP core. Allow config_clks to be passed for single clk
case.
Tested-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Diffstat (limited to 'drivers/opp')
| -rw-r--r-- | drivers/opp/core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/opp/core.c b/drivers/opp/core.c index 0c5b12e99d39..4f4a285886fa 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -2191,7 +2191,7 @@ static int _opp_set_clknames(struct opp_table *opp_table, struct device *dev, count = 1; /* Fail early for invalid configurations */ - if (!count || (config_clks && count == 1) || (!config_clks && count > 1)) + if (!count || (!config_clks && count > 1)) return -EINVAL; /* Another CPU that shares the OPP table has set the clkname ? */ @@ -2217,10 +2217,12 @@ static int _opp_set_clknames(struct opp_table *opp_table, struct device *dev, } opp_table->clk_count = count; + opp_table->config_clks = config_clks; /* Set generic single clk set here */ if (count == 1) { - opp_table->config_clks = _opp_config_clk_single; + if (!opp_table->config_clks) + opp_table->config_clks = _opp_config_clk_single; /* * We could have just dropped the "clk" field and used "clks" @@ -2235,8 +2237,6 @@ static int _opp_set_clknames(struct opp_table *opp_table, struct device *dev, * too. */ opp_table->clk = opp_table->clks[0]; - } else { - opp_table->config_clks = config_clks; } return 0; |