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

Commit 29dbdcf3 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regulator/topic/core' into regulator-next

parents b098d672 8669544a

drivers/regulator/core.c

+14 −0
Original line number Diff line number Diff line
@@ -2399,6 +2399,7 @@ int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV) 
	struct regulator_dev *rdev = regulator->rdev;

	int ret = 0;

	int old_min_uV, old_max_uV;

	int current_uV;



	mutex_lock(&rdev->mutex);
@@ -2409,6 +2410,19 @@ int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV) 
	if (regulator->min_uV == min_uV && regulator->max_uV == max_uV)

		goto out;



	/* If we're trying to set a range that overlaps the current voltage,

	 * return succesfully even though the regulator does not support

	 * changing the voltage.

	 */

	if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_VOLTAGE)) {

		current_uV = _regulator_get_voltage(rdev);

		if (min_uV <= current_uV && current_uV <= max_uV) {

			regulator->min_uV = min_uV;

			regulator->max_uV = max_uV;

			goto out;

		}

	}



	/* sanity check */

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

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

drivers/regulator/dummy.c

+5 −1
Original line number Diff line number Diff line
@@ -25,7 +25,11 @@ 


struct regulator_dev *dummy_regulator_rdev;



static struct regulator_init_data dummy_initdata;

static struct regulator_init_data dummy_initdata = {

	.constraints = {

		.always_on = 1,

	},

};



static struct regulator_ops dummy_ops;

drivers/regulator/pfuze100-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ MODULE_DEVICE_TABLE(of, pfuze_dt_ids); 
static int pfuze100_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay)

{

	struct pfuze_chip *pfuze100 = rdev_get_drvdata(rdev);

	int id = rdev->desc->id;

	int id = rdev_get_id(rdev);

	unsigned int ramp_bits;

	int ret;

drivers/regulator/s2mps11.c

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static int s2mps11_regulator_set_voltage_time_sel(struct regulator_dev *rdev, 
	unsigned int ramp_delay = 0;

	int old_volt, new_volt;



	switch (rdev->desc->id) {

	switch (rdev_get_id(rdev)) {

	case S2MPS11_BUCK2:

		ramp_delay = s2mps11->ramp_delay2;

		break;
@@ -105,7 +105,7 @@ static int s2mps11_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay) 
	unsigned int ramp_enable = 1, enable_shift = 0;

	int ret;



	switch (rdev->desc->id) {

	switch (rdev_get_id(rdev)) {

	case S2MPS11_BUCK1:

		if (ramp_delay > s2mps11->ramp_delay16)

			s2mps11->ramp_delay16 = ramp_delay;