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

Commit 8f4490e0 authored by Bjorn Andersson's avatar Bjorn Andersson Committed by Mark Brown
Browse files

regulator: core: Introduce set_load op 



Expose the requested load directly to the regulator implementation for
hardware that does not support the normal enum based set_mode().

Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c517d838

drivers/regulator/core.c

+24 −15
Original line number Diff line number Diff line
@@ -648,10 +648,12 @@ static int drms_uA_update(struct regulator_dev *rdev) 
	if (err < 0)

		return 0;



	if (!rdev->desc->ops->get_optimum_mode)

	if (!rdev->desc->ops->get_optimum_mode &&

	    !rdev->desc->ops->set_load)

		return 0;



	if (!rdev->desc->ops->set_mode)

	if (!rdev->desc->ops->set_mode &&

	    !rdev->desc->ops->set_load)

		return -EINVAL;



	/* get output voltage */
@@ -676,6 +678,12 @@ static int drms_uA_update(struct regulator_dev *rdev) 
	list_for_each_entry(sibling, &rdev->consumer_list, list)

		current_uA += sibling->uA_load;



	if (rdev->desc->ops->set_load) {

		/* set the optimum mode for our new total regulator load */

		err = rdev->desc->ops->set_load(rdev, current_uA);

		if (err < 0)

			rdev_err(rdev, "failed to set load %d\n", current_uA);

	} else {

		/* now get the optimum mode for our new total regulator load */

		mode = rdev->desc->ops->get_optimum_mode(rdev, input_uV,

							 output_uV, current_uA);
@@ -691,6 +699,7 @@ static int drms_uA_update(struct regulator_dev *rdev) 
		err = rdev->desc->ops->set_mode(rdev, mode);

		if (err < 0)

			rdev_err(rdev, "failed to set optimum mode %x\n", mode);

	}



	return err;

}

include/linux/regulator/driver.h

+3 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ struct regulator_linear_range { 
 *	REGULATOR_STATUS value (or negative errno)

 * @get_optimum_mode: Get the most efficient operating mode for the regulator

 *                    when running with the specified parameters.

 * @set_load: Set the load for the regulator.

 *

 * @set_bypass: Set the regulator in bypass mode.

 * @get_bypass: Get the regulator bypass mode state.
@@ -167,6 +168,8 @@ struct regulator_ops { 
	/* get most efficient regulator operating mode for load */

	unsigned int (*get_optimum_mode) (struct regulator_dev *, int input_uV,

					  int output_uV, int load_uA);

	/* set the load on the regulator */

	int (*set_load)(struct regulator_dev *, int load_uA);



	/* control and report on bypass mode */

	int (*set_bypass)(struct regulator_dev *dev, bool enable);