Merge remote-tracking branches 'regulator/topic/notifier', 'regulator/topic/pfuze100...

[mirror_ubuntu-bionic-kernel.git] / drivers / regulator / core.c

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 462e6e679ce1db4131c929db00512a979eef6232..c0d9ae8d0860e8e9466dee6fe1e275853b1f9e3b 100644 (file)
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2172,6 +2172,8 @@ static int _regulator_enable(struct regulator_dev *rdev)
                        if (ret < 0)
                                return ret;
 
+                       _notifier_call_chain(rdev, REGULATOR_EVENT_ENABLE,
+                                            NULL);
                } else if (ret < 0) {
                        rdev_err(rdev, "is_enabled() failed: %d\n", ret);
                        return ret;
@@ -2763,6 +2765,8 @@ static int _regulator_set_voltage_time(struct regulator_dev *rdev,
                ramp_delay = rdev->constraints->ramp_delay;
        else if (rdev->desc->ramp_delay)
                ramp_delay = rdev->desc->ramp_delay;
+       else if (rdev->constraints->settling_time)
+               return rdev->constraints->settling_time;
 
        if (ramp_delay == 0) {
                rdev_dbg(rdev, "ramp_delay not set\n");