Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / drivers / regulator / fixed.c

diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
index f81533070058e29db66991311ec4bbbec0c32636..bc0bbd99e98d0471b5ce176309d6b8caec28e3a0 100644 (file)
--- 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,