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

Commit 068c65c5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-v4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator 

Pull regulator fixes from Mark Brown:
 "A couple of driver specific fixes plus a fix for a regression in the
  core where the updates to use sysfs group registration were overly
  enthusiastic in eliding properties and removed some that had been
  previously present"

* tag 'regulator-v4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: Fix regression due to NULL constraints check
  regulator: rk808: Set the enable time for LDOs
  regulator: da9210: Mask all interrupt sources to deassert interrupt line
parents d08edd8f b5dabc8d

drivers/regulator/core.c

+0 −7
Original line number Diff line number Diff line
@@ -3444,13 +3444,6 @@ static umode_t regulator_attr_is_visible(struct kobject *kobj, 
	if (attr == &dev_attr_requested_microamps.attr)

		return rdev->desc->type == REGULATOR_CURRENT ? mode : 0;



	/* all the other attributes exist to support constraints;

	 * don't show them if there are no constraints, or if the

	 * relevant supporting methods are missing.

	 */

	if (!rdev->constraints)

		return 0;



	/* constraints need specific supporting methods */

	if (attr == &dev_attr_min_microvolts.attr ||

	    attr == &dev_attr_max_microvolts.attr)

drivers/regulator/da9210-regulator.c

+9 −0
Original line number Diff line number Diff line
@@ -152,6 +152,15 @@ static int da9210_i2c_probe(struct i2c_client *i2c, 
	config.regmap = chip->regmap;

	config.of_node = dev->of_node;



	/* Mask all interrupt sources to deassert interrupt line */

	error = regmap_write(chip->regmap, DA9210_REG_MASK_A, ~0);

	if (!error)

		error = regmap_write(chip->regmap, DA9210_REG_MASK_B, ~0);

	if (error) {

		dev_err(&i2c->dev, "Failed to write to mask reg: %d\n", error);

		return error;

	}



	rdev = devm_regulator_register(&i2c->dev, &da9210_reg, &config);

	if (IS_ERR(rdev)) {

		dev_err(&i2c->dev, "Failed to register DA9210 regulator\n");

drivers/regulator/rk808-regulator.c

+8 −0
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ static const struct regulator_desc rk808_reg[] = { 
		.vsel_mask = RK808_LDO_VSEL_MASK,

		.enable_reg = RK808_LDO_EN_REG,

		.enable_mask = BIT(0),

		.enable_time = 400,

		.owner = THIS_MODULE,

	}, {

		.name = "LDO_REG2",
@@ -249,6 +250,7 @@ static const struct regulator_desc rk808_reg[] = { 
		.vsel_mask = RK808_LDO_VSEL_MASK,

		.enable_reg = RK808_LDO_EN_REG,

		.enable_mask = BIT(1),

		.enable_time = 400,

		.owner = THIS_MODULE,

	}, {

		.name = "LDO_REG3",
@@ -263,6 +265,7 @@ static const struct regulator_desc rk808_reg[] = { 
		.vsel_mask = RK808_BUCK4_VSEL_MASK,

		.enable_reg = RK808_LDO_EN_REG,

		.enable_mask = BIT(2),

		.enable_time = 400,

		.owner = THIS_MODULE,

	}, {

		.name = "LDO_REG4",
@@ -277,6 +280,7 @@ static const struct regulator_desc rk808_reg[] = { 
		.vsel_mask = RK808_LDO_VSEL_MASK,

		.enable_reg = RK808_LDO_EN_REG,

		.enable_mask = BIT(3),

		.enable_time = 400,

		.owner = THIS_MODULE,

	}, {

		.name = "LDO_REG5",
@@ -291,6 +295,7 @@ static const struct regulator_desc rk808_reg[] = { 
		.vsel_mask = RK808_LDO_VSEL_MASK,

		.enable_reg = RK808_LDO_EN_REG,

		.enable_mask = BIT(4),

		.enable_time = 400,

		.owner = THIS_MODULE,

	}, {

		.name = "LDO_REG6",
@@ -305,6 +310,7 @@ static const struct regulator_desc rk808_reg[] = { 
		.vsel_mask = RK808_LDO_VSEL_MASK,

		.enable_reg = RK808_LDO_EN_REG,

		.enable_mask = BIT(5),

		.enable_time = 400,

		.owner = THIS_MODULE,

	}, {

		.name = "LDO_REG7",
@@ -319,6 +325,7 @@ static const struct regulator_desc rk808_reg[] = { 
		.vsel_mask = RK808_LDO_VSEL_MASK,

		.enable_reg = RK808_LDO_EN_REG,

		.enable_mask = BIT(6),

		.enable_time = 400,

		.owner = THIS_MODULE,

	}, {

		.name = "LDO_REG8",
@@ -333,6 +340,7 @@ static const struct regulator_desc rk808_reg[] = { 
		.vsel_mask = RK808_LDO_VSEL_MASK,

		.enable_reg = RK808_LDO_EN_REG,

		.enable_mask = BIT(7),

		.enable_time = 400,

		.owner = THIS_MODULE,

	}, {

		.name = "SWITCH_REG1",