开云体育

Turn regulators_enable_boot_on() and regulators_enable_boot_off() into
empty functions. Implement matching functionality in regulator_post_probe=
()
instead. The regulator_post_probe() is called for all regulators after th=
ey
probe, and regulators that have regulator-always-on or regulator-boot-on =
DT
properties now always probe due to DM_FLAG_PROBE_AFTER_BIND being set on
such regulators in regulator_post_bind().

Finally, fold regulator_unset() functionality into regulator_autoset().

Signed-off-by: Marek Vasut <marex@...>
---
Cc: Ben Wolsieffer <benwolsieffer@...>
Cc: Caleb Connolly <caleb.connolly@...>
Cc: Chris Morgan <macromorgan@...>
Cc: Dragan Simic <dsimic@...>
Cc: Eugen Hristev <eugen.hristev@...>
Cc: Francesco Dolcini <francesco.dolcini@...>
Cc: Heinrich Schuchardt <xypron.glpk@...>
Cc: Jaehoon Chung <jh80.chung@...>
Cc: Jagan Teki <jagan@...>
Cc: Jonas Karlman <jonas@...>
Cc: Kever Yang <kever.yang@...>
Cc: Matteo Lisi <matteo.lisi@...>
Cc: Mattijs Korpershoek <mkorpershoek@...>
Cc: Max Krummenacher <max.krummenacher@...>
Cc: Neil Armstrong <neil.armstrong@...>
Cc: Patrice Chotard <patrice.chotard@...>
Cc: Patrick Delaunay <patrick.delaunay@...>
Cc: Philipp Tomsich <philipp.tomsich@...>
Cc: Quentin Schulz <quentin.schulz@...>
Cc: Sam Day <me@...>
Cc: Simon Glass <sjg@...>
Cc: Sumit Garg <sumit.garg@...>
Cc: Svyatoslav Ryhel <clamor95@...>
Cc: Thierry Reding <treding@...>
Cc: Tom Rini <trini@...>
Cc: Volodymyr Babchuk <Volodymyr_Babchuk@...>
Cc: [email protected]
Cc: [email protected]
Cc: u-boot@...
Cc: u-boot@...
Cc: uboot-stm32@...
---
V2: Rebase on current u-boot/next
---
drivers/power/regulator/regulator-uclass.c | 60 +++++++---------------
1 file changed, 19 insertions(+), 41 deletions(-)

diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/r=
egulator/regulator-uclass.c
index e2f703702e3..14cf3159203 100644
--- a/drivers/power/regulator/regulator-uclass.c
+++ b/drivers/power/regulator/regulator-uclass.c
@@ -308,6 +308,11 @@ int regulator_autoset(struct udevice *dev)
return ret;
}
=20
+ if (uc_pdata->force_off) {
+ ret =3D regulator_set_enable(dev, false);
+ goto out;
+ }
+
if (!uc_pdata->always_on && !uc_pdata->boot_on) {
ret =3D -EMEDIUMTYPE;
goto out;
@@ -512,56 +517,28 @@ static int regulator_pre_probe(struct udevice *dev)
return 0;
}
=20
-int regulators_enable_boot_on(bool verbose)
+static int regulator_post_probe(struct udevice *dev)
{
- struct udevice *dev;
- struct uclass *uc;
int ret;
=20
- ret =3D uclass_get(UCLASS_REGULATOR, &uc);
- if (ret)
+ ret =3D regulator_autoset(dev);
+ if (ret && ret !=3D -EMEDIUMTYPE && ret !=3D -EALREADY && ret !=3D ENOS=
YS)
return ret;
- for (uclass_first_device(UCLASS_REGULATOR, &dev);
- dev;
- uclass_next_device(&dev)) {
- ret =3D regulator_autoset(dev);
- if (ret =3D=3D -EMEDIUMTYPE || ret =3D=3D -EALREADY) {
- ret =3D 0;
- continue;
- }
- if (verbose)
- regulator_show(dev, ret);
- if (ret =3D=3D -ENOSYS)
- ret =3D 0;
- }
=20
- return ret;
+ if (_DEBUG)
+ regulator_show(dev, ret);
+
+ return 0;
}
=20
-int regulators_enable_boot_off(bool verbose)
+int regulators_enable_boot_on(bool verbose)
{
- struct udevice *dev;
- struct uclass *uc;
- int ret;
-
- ret =3D uclass_get(UCLASS_REGULATOR, &uc);
- if (ret)
- return ret;
- for (uclass_first_device(UCLASS_REGULATOR, &dev);
- dev;
- uclass_next_device(&dev)) {
- ret =3D regulator_unset(dev);
- if (ret =3D=3D -EMEDIUMTYPE) {
- ret =3D 0;
- continue;
- }
- if (verbose)
- regulator_show(dev, ret);
- if (ret =3D=3D -ENOSYS)
- ret =3D 0;
- }
+ return 0;
+}
=20
- return ret;
+int regulators_enable_boot_off(bool verbose)
+{
+ return 0;
}
=20
UCLASS_DRIVER(regulator) =3D {
@@ -569,5 +546,6 @@ UCLASS_DRIVER(regulator) =3D {
.name =3D "regulator",
.post_bind =3D regulator_post_bind,
.pre_probe =3D regulator_pre_probe,
+ .post_probe =3D regulator_post_probe,
.per_device_plat_auto =3D sizeof(struct dm_regulator_uclass_plat),
};
--=20
2.45.2