Skip to content

Commit

Permalink
Merge branch 'opp/fixes-for-4.20' of git://git.kernel.org/pub/scm/lin…
Browse files Browse the repository at this point in the history
…ux/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
  • Loading branch information
Rafael J. Wysocki committed Nov 19, 2018
2 parents 9ff0119 + 622fecb commit 6eb5c9b
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion drivers/opp/ti-opp-supply.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 6eb5c9b

Please sign in to comment.