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

Commit 5b49ad10 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes Ib8e6db65,I8b3ec8d6 into msm-next 

* changes:
  Revert "regulator: Enable supply regulator if child rail is enabled."
  regulator: add verbose error messages for invalid voltage requests
parents eff9d4b5 a3bb591c

drivers/regulator/core.c

+17 −10
Original line number Diff line number Diff line
@@ -224,6 +224,15 @@ static int regulator_check_voltage(struct regulator_dev *rdev, 
		return -EPERM;

	}



	/* check if requested voltage range actually overlaps the constraints */

	if (*max_uV < rdev->constraints->min_uV ||

	    *min_uV > rdev->constraints->max_uV) {

		rdev_err(rdev, "requested voltage range [%d, %d] does not fit within constraints: [%d, %d]\n",

			*min_uV, *max_uV, rdev->constraints->min_uV,

			rdev->constraints->max_uV);

		return -EINVAL;

	}



	if (*max_uV > rdev->constraints->max_uV)

		*max_uV = rdev->constraints->max_uV;

	if (*min_uV < rdev->constraints->min_uV)
@@ -245,6 +254,8 @@ static int regulator_check_consumers(struct regulator_dev *rdev, 
				     int *min_uV, int *max_uV)

{

	struct regulator *regulator;

	int init_min_uV = *min_uV;

	int init_max_uV = *max_uV;



	list_for_each_entry(regulator, &rdev->consumer_list, list) {

		/*
@@ -254,6 +265,12 @@ static int regulator_check_consumers(struct regulator_dev *rdev, 
		if (!regulator->min_uV && !regulator->max_uV)

			continue;



		if (init_max_uV < regulator->min_uV

		    || init_min_uV > regulator->max_uV)

			rdev_err(rdev, "requested voltage range [%d, %d] does not fit within previously voted range: [%d, %d]\n",

				init_min_uV, init_max_uV, regulator->min_uV,

				regulator->max_uV);



		if (*max_uV > regulator->max_uV)

			*max_uV = regulator->max_uV;

		if (*min_uV < regulator->min_uV)
@@ -1582,16 +1599,6 @@ static int regulator_resolve_supply(struct regulator_dev *rdev) 
		return ret;

	}



	/* Cascade always-on state to supply */

	if (_regulator_is_enabled(rdev)) {

		ret = regulator_enable(rdev->supply);

		if (ret < 0) {

			_regulator_put(rdev->supply);

			rdev->supply = NULL;

			return ret;

		}

	}



	return 0;

}