diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-11-19 11:22:04 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-11-19 11:22:04 +0100 |
| commit | 6eb5c9b5edffe626d2df6a22f449dc7fab253841 (patch) | |
| tree | 6cbfa1e808661a9836bc99b10fc047e7b5f52288 /drivers | |
| parent | Linux 4.20-rc3 (diff) | |
| parent | opp: ti-opp-supply: Correct the supply in _get_optimal_vdd_voltage call (diff) | |
| download | linux-6eb5c9b5edffe626d2df6a22f449dc7fab253841.tar.xz linux-6eb5c9b5edffe626d2df6a22f449dc7fab253841.zip | |
Merge branch 'opp/fixes-for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm
Pull operating performance points (OPP) framework fixes for 4.20 from
Viresh Kumar.
* 'opp/fixes-for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
opp: ti-opp-supply: Correct the supply in _get_optimal_vdd_voltage call
opp: ti-opp-supply: Dynamically update u_volt_min
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/opp/ti-opp-supply.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/opp/ti-opp-supply.c b/drivers/opp/ti-opp-supply.c index 9e5a9a3112c9..3f4fb4dbbe33 100644 --- a/drivers/opp/ti-opp-supply.c +++ b/drivers/opp/ti-opp-supply.c @@ -288,7 +288,10 @@ static int ti_opp_supply_set_opp(struct dev_pm_set_opp_data *data) int ret; vdd_uv = _get_optimal_vdd_voltage(dev, &opp_data, - new_supply_vbb->u_volt); + new_supply_vdd->u_volt); + + if (new_supply_vdd->u_volt_min < vdd_uv) + new_supply_vdd->u_volt_min = vdd_uv; /* Scaling up? Scale voltage before frequency */ if (freq > old_freq) { |