diff options
| author | Mark Brown <broonie@kernel.org> | 2019-11-22 19:56:20 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-11-22 19:56:20 +0000 |
| commit | a21da94f617bce0771144ea8093b6987184b38d0 (patch) | |
| tree | ca8fe8bcd71f07a9215e6ac3a584fc22a45a3d8b /drivers/regulator/fixed.c | |
| parent | c642e87086847d7f61b7b7d8744ac23e44cac91e (diff) | |
| parent | c15d5a645875bc9b89f68f5d3fb608f691ac78d7 (diff) | |
Merge branch 'regulator-5.5' into regulator-next
Diffstat (limited to 'drivers/regulator/fixed.c')
| -rw-r--r-- | drivers/regulator/fixed.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c index f81533070058..bc0bbd99e98d 100644 --- a/drivers/regulator/fixed.c +++ b/drivers/regulator/fixed.c @@ -123,6 +123,7 @@ of_get_fixed_voltage_config(struct device *dev, config->enabled_at_boot = true; of_property_read_u32(np, "startup-delay-us", &config->startup_delay); + of_property_read_u32(np, "off-on-delay-us", &config->off_on_delay); if (of_find_property(np, "vin-supply", NULL)) config->input_supply = "vin"; @@ -189,6 +190,7 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev) } drvdata->desc.enable_time = config->startup_delay; + drvdata->desc.off_on_delay = config->off_on_delay; if (config->input_supply) { drvdata->desc.supply_name = devm_kstrdup(&pdev->dev, |