diff options
| author | Tom Rini <trini@konsulko.com> | 2022-10-26 07:46:48 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-10-26 07:46:48 -0400 |
| commit | b487387226d49ba2f39757269fb95ea398e8f384 (patch) | |
| tree | 5b9fe906c101b5b0204227f6c8ec42f4588000f2 | |
| parent | c2c485db455696850f17a874f8b5a11d13b31b5c (diff) | |
| parent | 0b9186277a944dd7c34c5d01850fbe57b6bfa10a (diff) | |
| download | u-boot-WIP/26Oct2022.zip u-boot-WIP/26Oct2022.tar.gz u-boot-WIP/26Oct2022.tar.bz2 | |
Merge https://source.denx.de/u-boot/custodians/u-boot-pmicWIP/26Oct2022
| -rw-r--r-- | drivers/power/pmic/fan53555.c | 2 | ||||
| -rw-r--r-- | drivers/power/regulator/regulator-uclass.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/power/pmic/fan53555.c b/drivers/power/pmic/fan53555.c index 4d1e686..0d91628 100644 --- a/drivers/power/pmic/fan53555.c +++ b/drivers/power/pmic/fan53555.c @@ -23,7 +23,7 @@ static int pmic_fan53555_read(struct udevice *dev, uint reg, u8 *buff, int len) { if (dm_i2c_read(dev, reg, buff, len)) { - pr_err("%s: read error for register: %#x!", dev->name, reg); + pr_err("%s: read error for register: %#x!\n", dev->name, reg); return -EIO; } diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c index aca00e5..d608f7c 100644 --- a/drivers/power/regulator/regulator-uclass.c +++ b/drivers/power/regulator/regulator-uclass.c @@ -288,9 +288,15 @@ int regulator_autoset(struct udevice *dev) uc_pdata = dev_get_uclass_plat(dev); ret = regulator_set_suspend_enable(dev, uc_pdata->suspend_on); + if (ret == -ENOSYS) + ret = 0; + if (!ret && uc_pdata->suspend_on) { ret = regulator_set_suspend_value(dev, uc_pdata->suspend_uV); - if (!ret) + if (ret == -ENOSYS) + ret = 0; + + if (ret) return ret; } |