Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4105dcfe authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Osvaldo Banuelos
Browse files

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.

Change-Id: Ib7f77d27b3ba3ef2a7704247398db8ab6b625c42
Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Git-commit: a1c8a5512b7cddc81767172f0de37b155cea039f
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git


[osvaldob@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: default avatarOsvaldo Banuelos <osvaldob@codeaurora.org>
parent 3e5d75b2

drivers/regulator/core.c

+16 −0
Original line number Diff line number Diff line
@@ -2018,9 +2018,18 @@ static int _regulator_disable(struct regulator_dev *rdev) 


		/* we are last user */

		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);

			if (ret < 0) {

				rdev_err(rdev, "failed to disable\n");

				_notifier_call_chain(rdev,

						REGULATOR_EVENT_ABORT_DISABLE,

						NULL);

				return ret;

			}

			_notifier_call_chain(rdev, REGULATOR_EVENT_DISABLE,
@@ -2079,9 +2088,16 @@ static int _regulator_force_disable(struct regulator_dev *rdev) 
{

	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);

	if (ret < 0) {

		rdev_err(rdev, "failed to force disable\n");

		_notifier_call_chain(rdev, REGULATOR_EVENT_FORCE_DISABLE |

				REGULATOR_EVENT_ABORT_DISABLE, NULL);

		return ret;

	}

include/linux/regulator/consumer.h

+5 −1
Original line number Diff line number Diff line
@@ -96,12 +96,14 @@ struct regmap; 
 * FORCE_DISABLE  Regulator forcibly shut down by software.

 * VOLTAGE_CHANGE Regulator voltage changed.

 *                Data passed is old voltage cast to (void *).

 * ENABLE         Regulator was enabled.

 * DISABLE        Regulator was disabled.

 * PRE_VOLTAGE_CHANGE   Regulator is about to have voltage changed.

 *                      Data passed is "struct pre_voltage_change_data"

 * ABORT_VOLTAGE_CHANGE Regulator voltage change failed for some reason.

 *                      Data passed is old voltage cast to (void *).

 * ENABLE         Regulator was enabled.

 * 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.

 */
@@ -116,6 +118,8 @@ struct regmap; 
#define REGULATOR_EVENT_DISABLE 		0x80

#define REGULATOR_EVENT_PRE_VOLTAGE_CHANGE	0x100

#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