diff options
Diffstat (limited to 'drivers/regulator/core.c')
| -rw-r--r-- | drivers/regulator/core.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 96bf846d9f..73f5c6eb4b 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -89,6 +89,7 @@ static int regulator_disable_internal(struct regulator_internal *ri) static struct regulator_internal * __regulator_register(struct regulator_dev *rd, const char *name) { struct regulator_internal *ri; + int ret; ri = xzalloc(sizeof(*ri)); ri->rdev = rd; @@ -100,7 +101,19 @@ static struct regulator_internal * __regulator_register(struct regulator_dev *rd if (name) ri->name = xstrdup(name); + if (rd->boot_on) { + ret = regulator_enable_internal(ri); + if (ret && ret != -ENOSYS) + goto err; + } + return ri; +err: + list_del(&ri->list); + free(ri->name); + free(ri); + + return ERR_PTR(ret); } @@ -117,6 +130,8 @@ int of_regulator_register(struct regulator_dev *rd, struct device_node *node) struct regulator_internal *ri; const char *name; + rd->boot_on = of_property_read_bool(node, "regulator-boot-on"); + name = of_get_property(node, "regulator-name", NULL); ri = __regulator_register(rd, name); |