summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnrico Jorns <ejo@pengutronix.de>2022-01-03 12:57:18 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2022-01-05 08:28:37 +0100
commit9f542bd7394888fe5e70fe72c377cc095771d460 (patch)
treedf19224f5e1076b111b479172d8e1ecd80cf77b4
parente81f07eb19e573a4cdfbdb0d9588712c89a41e2c (diff)
downloadbarebox-9f542bd7394888fe5e70fe72c377cc095771d460.tar.gz
barebox-9f542bd7394888fe5e70fe72c377cc095771d460.tar.xz
regulator: respect "regulator-always-on" property
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 <ejo@pengutronix.de> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Link: https://lore.barebox.org/20220103115718.1723730-6-a.fatoum@pengutronix.de Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--drivers/regulator/core.c3
-rw-r--r--include/regulator.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index ac4141c1cd..b2e5f8caa2 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 bbe8dd91d8..dfdfbf0332 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;
};