Unverified Commit ffb8c1e4 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/coupled' of... 

Merge branch 'topic/coupled' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-4.21 for trivial conflict
parents a8d8ee43 ff9b34b6

Documentation/devicetree/bindings/regulator/regulator.txt

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ Optional properties: 
- regulator-coupled-max-spread: Array of maximum spread between voltages of

  coupled regulators in microvolts, each value in the array relates to the

  corresponding couple specified by the regulator-coupled-with property.

- regulator-max-step-microvolt: Maximum difference between current and target

  voltages that can be changed safely in a single step.



Deprecated properties:

- regulator-compatible: If a regulator chip contains multiple

drivers/regulator/core.c

+707 −125

File changed.

Preview size limit exceeded, changes collapsed.

drivers/regulator/da9210-regulator.c

+2 −2
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static irqreturn_t da9210_irq_handler(int irq, void *data) 
	if (error < 0)

		goto error_i2c;



	mutex_lock(&chip->rdev->mutex);

	regulator_lock(chip->rdev);



	if (val & DA9210_E_OVCURR) {

		regulator_notifier_call_chain(chip->rdev,
@@ -157,7 +157,7 @@ static irqreturn_t da9210_irq_handler(int irq, void *data) 
		handled |= DA9210_E_VMAX;

	}



	mutex_unlock(&chip->rdev->mutex);

	regulator_unlock(chip->rdev);



	if (handled) {

		/* Clear handled events */

drivers/regulator/of_regulator.c

+4 −0
Original line number Diff line number Diff line
@@ -171,6 +171,10 @@ static void of_get_regulation_constraints(struct device_node *np, 
				  &pval))

		constraints->max_spread = pval;



	if (!of_property_read_u32(np, "regulator-max-step-microvolt",

				  &pval))

		constraints->max_uV_step = pval;



	constraints->over_current_protection = of_property_read_bool(np,

					"regulator-over-current-protection");

drivers/regulator/stpmic1_regulator.c

+2 −2
Original line number Diff line number Diff line
@@ -489,14 +489,14 @@ static irqreturn_t stpmic1_curlim_irq_handler(int irq, void *data) 
{

	struct regulator_dev *rdev = (struct regulator_dev *)data;



	mutex_lock(&rdev->mutex);

	regulator_lock(rdev, NULL);



	/* Send an overcurrent notification */

	regulator_notifier_call_chain(rdev,

				      REGULATOR_EVENT_OVER_CURRENT,

				      NULL);



	mutex_unlock(&rdev->mutex);

	regulator_unlock(rdev);



	return IRQ_HANDLED;

}