Commit 6eb5c9b5 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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
parents 9ff01193 622fecbc

drivers/opp/ti-opp-supply.c

+4 −1
Original line number Diff line number Diff line
@@ -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) {