diff options
| author | Tom Rini <trini@konsulko.com> | 2020-01-08 15:08:34 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-08 15:08:34 -0500 |
| commit | 3e99c183739afe698df8a4ba813940c94379095b (patch) | |
| tree | 846ac3ff496f57d6440b17028bc0c801007bbdc3 /drivers/power/regulator/regulator_common.c | |
| parent | d8a3f5259a36e76d1de127f65714c40918e8ee4c (diff) | |
| parent | 964b90f61d2b49844bd42d0a0580e1a404063ee1 (diff) | |
Merge branch '2020-01-07-master-imports'
- DT overlay support in FIT images in SPL
- remoteproc update
- Assorted SATA fixes
- Other assorted fixes
Diffstat (limited to 'drivers/power/regulator/regulator_common.c')
| -rw-r--r-- | drivers/power/regulator/regulator_common.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/power/regulator/regulator_common.c b/drivers/power/regulator/regulator_common.c index 2041086567..939efb2c0d 100644 --- a/drivers/power/regulator/regulator_common.c +++ b/drivers/power/regulator/regulator_common.c @@ -37,7 +37,11 @@ int regulator_common_ofdata_to_platdata(struct udevice *dev, dev_pdata->startup_delay_us = dev_read_u32_default(dev, "startup-delay-us", 0); dev_pdata->off_on_delay_us = + dev_read_u32_default(dev, "off-on-delay-us", 0); + if (!dev_pdata->off_on_delay_us) { + dev_pdata->off_on_delay_us = dev_read_u32_default(dev, "u-boot,off-on-delay-us", 0); + } return 0; } |