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

Commit 638f85c5 authored by Mark Brown's avatar Mark Brown Committed by Liam Girdwood
Browse files

regulator: Handle regulators without suspend mode configuration 



Since some regulators in the system may not support suspend mode
configuration we need to allow some regulators to have a missing
suspend mode configuration. Do this by requiring that disabled
regulators are explicitly flagged and then skip over regulators
that have no state specified.

Try to avoid surprises by warning the if we could set the state
but no configuration is provided.  This also ensures that an all
zeros configuration generates a warning rather than silently
disabling the regulator.

Reported-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 1083c393

drivers/regulator/core.c

+22 −3
Original line number Diff line number Diff line
@@ -581,10 +581,29 @@ static int suspend_set_state(struct regulator_dev *rdev, 
	struct regulator_state *rstate)

{

	int ret = 0;

	bool can_set_state;



	/* enable & disable are mandatory for suspend control */

	if (!rdev->desc->ops->set_suspend_enable ||

		!rdev->desc->ops->set_suspend_disable) {

	can_set_state = rdev->desc->ops->set_suspend_enable &&

		rdev->desc->ops->set_suspend_disable;



	/* If we have no suspend mode configration don't set anything;

	 * only warn if the driver actually makes the suspend mode

	 * configurable.

	 */

	if (!rstate->enabled && !rstate->disabled) {

		if (can_set_state)

			printk(KERN_WARNING "%s: No configuration for %s\n",

			       __func__, rdev_get_name(rdev));

		return 0;

	}



	if (rstate->enabled && rstate->disabled) {

		printk(KERN_ERR "%s: invalid configuration for %s\n",

		       __func__, rdev_get_name(rdev));

		return -EINVAL;

	}



	if (!can_set_state) {

		printk(KERN_ERR "%s: no way to set suspend state\n",

			__func__);

		return -EINVAL;

include/linux/regulator/machine.h

+5 −1
Original line number Diff line number Diff line
@@ -43,16 +43,20 @@ struct regulator; 
/**

 * struct regulator_state - regulator state during low power system states

 *

 * This describes a regulators state during a system wide low power state.

 * This describes a regulators state during a system wide low power

 * state.  One of enabled or disabled must be set for the

 * configuration to be applied.

 *

 * @uV: Operating voltage during suspend.

 * @mode: Operating mode during suspend.

 * @enabled: Enabled during suspend.

 * @disabled: Disabled during suspend.

 */

struct regulator_state {

	int uV;	/* suspend voltage */

	unsigned int mode; /* suspend regulator operating mode */

	int enabled; /* is regulator enabled in this suspend state */

	int disabled; /* is the regulator disbled in this suspend state */

};



/**