Commit a1c8a551 authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Mark Brown

regulator: core: Add PRE_DISABLE notification

Add a PRE_DISABLE notification so that consumers can use a
notifier to run any steps required to prepare for the
regulator being switched off. Since the regulator disable
can fail an abort notification is also added.
Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f114040e
...@@ -1976,9 +1976,18 @@ static int _regulator_disable(struct regulator_dev *rdev) ...@@ -1976,9 +1976,18 @@ static int _regulator_disable(struct regulator_dev *rdev)
/* we are last user */ /* we are last user */
if (_regulator_can_change_status(rdev)) { if (_regulator_can_change_status(rdev)) {
ret = _notifier_call_chain(rdev,
REGULATOR_EVENT_PRE_DISABLE,
NULL);
if (ret & NOTIFY_STOP_MASK)
return -EINVAL;
ret = _regulator_do_disable(rdev); ret = _regulator_do_disable(rdev);
if (ret < 0) { if (ret < 0) {
rdev_err(rdev, "failed to disable\n"); rdev_err(rdev, "failed to disable\n");
_notifier_call_chain(rdev,
REGULATOR_EVENT_ABORT_DISABLE,
NULL);
return ret; return ret;
} }
_notifier_call_chain(rdev, REGULATOR_EVENT_DISABLE, _notifier_call_chain(rdev, REGULATOR_EVENT_DISABLE,
...@@ -2035,9 +2044,16 @@ static int _regulator_force_disable(struct regulator_dev *rdev) ...@@ -2035,9 +2044,16 @@ static int _regulator_force_disable(struct regulator_dev *rdev)
{ {
int ret = 0; int ret = 0;
ret = _notifier_call_chain(rdev, REGULATOR_EVENT_FORCE_DISABLE |
REGULATOR_EVENT_PRE_DISABLE, NULL);
if (ret & NOTIFY_STOP_MASK)
return -EINVAL;
ret = _regulator_do_disable(rdev); ret = _regulator_do_disable(rdev);
if (ret < 0) { if (ret < 0) {
rdev_err(rdev, "failed to force disable\n"); rdev_err(rdev, "failed to force disable\n");
_notifier_call_chain(rdev, REGULATOR_EVENT_FORCE_DISABLE |
REGULATOR_EVENT_ABORT_DISABLE, NULL);
return ret; return ret;
} }
......
...@@ -99,6 +99,8 @@ struct regmap; ...@@ -99,6 +99,8 @@ struct regmap;
* Data passed is "struct pre_voltage_change_data" * Data passed is "struct pre_voltage_change_data"
* ABORT_VOLTAGE_CHANGE Regulator voltage change failed for some reason. * ABORT_VOLTAGE_CHANGE Regulator voltage change failed for some reason.
* Data passed is old voltage cast to (void *). * Data passed is old voltage cast to (void *).
* PRE_DISABLE Regulator is about to be disabled
* ABORT_DISABLE Regulator disable failed for some reason
* *
* NOTE: These events can be OR'ed together when passed into handler. * NOTE: These events can be OR'ed together when passed into handler.
*/ */
...@@ -113,6 +115,8 @@ struct regmap; ...@@ -113,6 +115,8 @@ struct regmap;
#define REGULATOR_EVENT_DISABLE 0x80 #define REGULATOR_EVENT_DISABLE 0x80
#define REGULATOR_EVENT_PRE_VOLTAGE_CHANGE 0x100 #define REGULATOR_EVENT_PRE_VOLTAGE_CHANGE 0x100
#define REGULATOR_EVENT_ABORT_VOLTAGE_CHANGE 0x200 #define REGULATOR_EVENT_ABORT_VOLTAGE_CHANGE 0x200
#define REGULATOR_EVENT_PRE_DISABLE 0x400
#define REGULATOR_EVENT_ABORT_DISABLE 0x800
/** /**
* struct pre_voltage_change_data - Data sent with PRE_VOLTAGE_CHANGE event * struct pre_voltage_change_data - Data sent with PRE_VOLTAGE_CHANGE event
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment