diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-02-18 08:36:44 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-02-18 08:36:44 +0100 |
| commit | d6787a36a64aeaff019bfb61b40f247f04c5ade8 (patch) | |
| tree | 8f4fd0981b811d925420b5ffb7c8bf12fd730939 /drivers/regulator | |
| parent | 0a54a21f182751a0f256119d8b048d8d169ed395 (diff) | |
| parent | f246b4079c746f80e29b07252c546d37a359105f (diff) | |
| download | barebox-d6787a36a64aeaff019bfb61b40f247f04c5ade8.tar.gz barebox-d6787a36a64aeaff019bfb61b40f247f04c5ade8.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/fixed.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c index cb5d785817..78b8290ff2 100644 --- a/drivers/regulator/fixed.c +++ b/drivers/regulator/fixed.c @@ -86,7 +86,8 @@ static int regulator_fixed_probe(struct device_d *dev) fix->rdesc.ops = &fixed_ops; fix->rdev.desc = &fix->rdesc; - if (of_find_property(dev->device_node, "regulator-always-on", NULL)) { + if (of_find_property(dev->device_node, "regulator-always-on", NULL) || + of_find_property(dev->device_node, "regulator-boot-on", NULL)) { fix->always_on = 1; regulator_fixed_enable(&fix->rdev); } |