colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

power: regulator: Do not call set_suspend_value with -ENODATA

Browse Source 
On some boards a PMIC regulator is flagged with regulator-on-in-suspend
and does not define any suspend or max microvolt, e.g. on Radxa ROCK 3A:

  vcc_ddr: DCDC_REG3 {
	regulator-name = "vcc_ddr";
	regulator-always-on;
	regulator-boot-on;
	regulator-initial-mode = <0x2>;

	regulator-state-mem {
		regulator-on-in-suspend;
	};
  };

This result in suspend_uV having the value -ENODATA after probe.

This negative voltage, -ENODATA, gets missinterpreted and result in an
unexpected voltage being set by autoset.

E.g. on Radxa ROCK 3A the vcc_ddr regulator by default have a normal and
suspend voltage value of 0.5v. However, due to this missinterpretation
the suspend voltage end up beind set to 0.5625v instead.

Fix this by skip calling regulator_set_suspend_value() in autoset and
also protect calling set value ops when input value is -ENODATA.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
This commit is contained in:
Jonas Karlman
2024-07-24 22:47:10 +00:00
committed by Tom Rini
parent 49e3b574ed
commit f417c14d88
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/power/regulator/regulator-uclass.c
View File

@@ -60,6 +60,8 @@ int regulator_set_value(struct udevice *dev, int uV)
return -EINVAL; return -EINVAL;
if (uc_pdata->max_uV != -ENODATA && uV > uc_pdata->max_uV) if (uc_pdata->max_uV != -ENODATA && uV > uc_pdata->max_uV)
return -EINVAL; return -EINVAL;
if (uV == -ENODATA)
return -EINVAL;
if (!ops || !ops->set_value) if (!ops || !ops->set_value)
return -ENOSYS; return -ENOSYS;
@@ -90,6 +92,8 @@ int regulator_set_suspend_value(struct udevice *dev, int uV)
return -EINVAL; return -EINVAL;
if (uc_pdata->max_uV != -ENODATA && uV > uc_pdata->max_uV) if (uc_pdata->max_uV != -ENODATA && uV > uc_pdata->max_uV)
return -EINVAL; return -EINVAL;
if (uV == -ENODATA)
return -EINVAL;
if (!ops->set_suspend_value) if (!ops->set_suspend_value)
return -ENOSYS; return -ENOSYS;
@@ -141,6 +145,8 @@ int regulator_set_current(struct udevice *dev, int uA)
return -EINVAL; return -EINVAL;
if (uc_pdata->max_uA != -ENODATA && uA > uc_pdata->max_uA) if (uc_pdata->max_uA != -ENODATA && uA > uc_pdata->max_uA)
return -EINVAL; return -EINVAL;
if (uA == -ENODATA)
return -EINVAL;
if (!ops || !ops->set_current) if (!ops || !ops->set_current)
return -ENOSYS; return -ENOSYS;
@@ -299,7 +305,7 @@ int regulator_autoset(struct udevice *dev)
if (ret == -ENOSYS) if (ret == -ENOSYS)
ret = 0; ret = 0;
if (!ret && uc_pdata->suspend_on) { if (!ret && uc_pdata->suspend_on && uc_pdata->suspend_uV != -ENODATA) {
ret = regulator_set_suspend_value(dev, uc_pdata->suspend_uV); ret = regulator_set_suspend_value(dev, uc_pdata->suspend_uV);
if (ret == -ENOSYS) if (ret == -ENOSYS)
ret = 0; ret = 0;