From: Enrico Jorns <[email protected]> As barebox ignored this property, a regulator could have been disabled even if it should not have been. By taking the same path as for 'regulator-boot-on', we ensure always holding an enable count > 0 on the regulator.
Signed-off-by: Enrico Jorns <[email protected]> Signed-off-by: Ahmad Fatoum <[email protected]> --- drivers/regulator/core.c | 3 ++- include/regulator.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index ac4141c1cdbf..b2e5f8caa2ca 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -130,7 +130,7 @@ static struct regulator_internal * __regulator_register(struct regulator_dev *rd if (name) ri->name = xstrdup(name); - if (rd->boot_on) { + if (rd->boot_on && rd->always_on) { ret = regulator_enable_internal(ri); if (ret && ret != -ENOSYS) goto err; @@ -163,6 +163,7 @@ int of_regulator_register(struct regulator_dev *rd, struct device_node *node) return -EINVAL; rd->boot_on = of_property_read_bool(node, "regulator-boot-on"); + rd->always_on = of_property_read_bool(node, "regulator-always-on"); name = of_get_property(node, "regulator-name", NULL); diff --git a/include/regulator.h b/include/regulator.h index bbe8dd91d84b..dfdfbf033262 100644 --- a/include/regulator.h +++ b/include/regulator.h @@ -84,7 +84,8 @@ struct regulator_desc { struct regulator_dev { const struct regulator_desc *desc; struct regmap *regmap; - int boot_on; + bool boot_on; + bool always_on; /* the device this regulator device belongs to */ struct device_d *dev; }; -- 2.30.2 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
