Commit c2c80ecd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v6.10-merge-window' of... 

Merge tag 'regulator-fix-v6.10-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "A bunch of fixes that came in during the merge window.

  Matti found several issues with some of the more complexly configured
  Rohm regulators and the helpers they use and there were some errors in
  the specification of tps6594 when regulators are grouped together"

* tag 'regulator-fix-v6.10-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: tps6594-regulator: Correct multi-phase configuration
  regulator: tps6287x: Force writing VSEL bit
  regulator: pickable ranges: don't always cache vsel
  regulator: rohm-regulator: warn if unsupported voltage is set
  regulator: bd71828: Don't overwrite runtime voltages
parents 09f8f2c4 74b38cd7

drivers/regulator/bd71828-regulator.c

+2 −56
Original line number Diff line number Diff line
@@ -206,14 +206,11 @@ static const struct bd71828_regulator_data bd71828_rdata[] = { 
			.suspend_reg = BD71828_REG_BUCK1_SUSP_VOLT,

			.suspend_mask = BD71828_MASK_BUCK1267_VOLT,

			.suspend_on_mask = BD71828_MASK_SUSP_EN,

			.lpsr_on_mask = BD71828_MASK_LPSR_EN,

			/*

			 * LPSR voltage is same as SUSPEND voltage. Allow

			 * setting it so that regulator can be set enabled at

			 * LPSR state

			 * only enabling/disabling regulator for LPSR state

			 */

			.lpsr_reg = BD71828_REG_BUCK1_SUSP_VOLT,

			.lpsr_mask = BD71828_MASK_BUCK1267_VOLT,

			.lpsr_on_mask = BD71828_MASK_LPSR_EN,

		},

		.reg_inits = buck1_inits,

		.reg_init_amnt = ARRAY_SIZE(buck1_inits),
@@ -288,13 +285,7 @@ static const struct bd71828_regulator_data bd71828_rdata[] = { 
				     ROHM_DVS_LEVEL_SUSPEND |

				     ROHM_DVS_LEVEL_LPSR,

			.run_reg = BD71828_REG_BUCK3_VOLT,

			.idle_reg = BD71828_REG_BUCK3_VOLT,

			.suspend_reg = BD71828_REG_BUCK3_VOLT,

			.lpsr_reg = BD71828_REG_BUCK3_VOLT,

			.run_mask = BD71828_MASK_BUCK3_VOLT,

			.idle_mask = BD71828_MASK_BUCK3_VOLT,

			.suspend_mask = BD71828_MASK_BUCK3_VOLT,

			.lpsr_mask = BD71828_MASK_BUCK3_VOLT,

			.idle_on_mask = BD71828_MASK_IDLE_EN,

			.suspend_on_mask = BD71828_MASK_SUSP_EN,

			.lpsr_on_mask = BD71828_MASK_LPSR_EN,
@@ -329,13 +320,7 @@ static const struct bd71828_regulator_data bd71828_rdata[] = { 
				     ROHM_DVS_LEVEL_SUSPEND |

				     ROHM_DVS_LEVEL_LPSR,

			.run_reg = BD71828_REG_BUCK4_VOLT,

			.idle_reg = BD71828_REG_BUCK4_VOLT,

			.suspend_reg = BD71828_REG_BUCK4_VOLT,

			.lpsr_reg = BD71828_REG_BUCK4_VOLT,

			.run_mask = BD71828_MASK_BUCK4_VOLT,

			.idle_mask = BD71828_MASK_BUCK4_VOLT,

			.suspend_mask = BD71828_MASK_BUCK4_VOLT,

			.lpsr_mask = BD71828_MASK_BUCK4_VOLT,

			.idle_on_mask = BD71828_MASK_IDLE_EN,

			.suspend_on_mask = BD71828_MASK_SUSP_EN,

			.lpsr_on_mask = BD71828_MASK_LPSR_EN,
@@ -370,13 +355,7 @@ static const struct bd71828_regulator_data bd71828_rdata[] = { 
				     ROHM_DVS_LEVEL_SUSPEND |

				     ROHM_DVS_LEVEL_LPSR,

			.run_reg = BD71828_REG_BUCK5_VOLT,

			.idle_reg = BD71828_REG_BUCK5_VOLT,

			.suspend_reg = BD71828_REG_BUCK5_VOLT,

			.lpsr_reg = BD71828_REG_BUCK5_VOLT,

			.run_mask = BD71828_MASK_BUCK5_VOLT,

			.idle_mask = BD71828_MASK_BUCK5_VOLT,

			.suspend_mask = BD71828_MASK_BUCK5_VOLT,

			.lpsr_mask = BD71828_MASK_BUCK5_VOLT,

			.idle_on_mask = BD71828_MASK_IDLE_EN,

			.suspend_on_mask = BD71828_MASK_SUSP_EN,

			.lpsr_on_mask = BD71828_MASK_LPSR_EN,
@@ -493,13 +472,7 @@ static const struct bd71828_regulator_data bd71828_rdata[] = { 
				     ROHM_DVS_LEVEL_SUSPEND |

				     ROHM_DVS_LEVEL_LPSR,

			.run_reg = BD71828_REG_LDO1_VOLT,

			.idle_reg = BD71828_REG_LDO1_VOLT,

			.suspend_reg = BD71828_REG_LDO1_VOLT,

			.lpsr_reg = BD71828_REG_LDO1_VOLT,

			.run_mask = BD71828_MASK_LDO_VOLT,

			.idle_mask = BD71828_MASK_LDO_VOLT,

			.suspend_mask = BD71828_MASK_LDO_VOLT,

			.lpsr_mask = BD71828_MASK_LDO_VOLT,

			.idle_on_mask = BD71828_MASK_IDLE_EN,

			.suspend_on_mask = BD71828_MASK_SUSP_EN,

			.lpsr_on_mask = BD71828_MASK_LPSR_EN,
@@ -533,13 +506,7 @@ static const struct bd71828_regulator_data bd71828_rdata[] = { 
				     ROHM_DVS_LEVEL_SUSPEND |

				     ROHM_DVS_LEVEL_LPSR,

			.run_reg = BD71828_REG_LDO2_VOLT,

			.idle_reg = BD71828_REG_LDO2_VOLT,

			.suspend_reg = BD71828_REG_LDO2_VOLT,

			.lpsr_reg = BD71828_REG_LDO2_VOLT,

			.run_mask = BD71828_MASK_LDO_VOLT,

			.idle_mask = BD71828_MASK_LDO_VOLT,

			.suspend_mask = BD71828_MASK_LDO_VOLT,

			.lpsr_mask = BD71828_MASK_LDO_VOLT,

			.idle_on_mask = BD71828_MASK_IDLE_EN,

			.suspend_on_mask = BD71828_MASK_SUSP_EN,

			.lpsr_on_mask = BD71828_MASK_LPSR_EN,
@@ -573,13 +540,7 @@ static const struct bd71828_regulator_data bd71828_rdata[] = { 
				     ROHM_DVS_LEVEL_SUSPEND |

				     ROHM_DVS_LEVEL_LPSR,

			.run_reg = BD71828_REG_LDO3_VOLT,

			.idle_reg = BD71828_REG_LDO3_VOLT,

			.suspend_reg = BD71828_REG_LDO3_VOLT,

			.lpsr_reg = BD71828_REG_LDO3_VOLT,

			.run_mask = BD71828_MASK_LDO_VOLT,

			.idle_mask = BD71828_MASK_LDO_VOLT,

			.suspend_mask = BD71828_MASK_LDO_VOLT,

			.lpsr_mask = BD71828_MASK_LDO_VOLT,

			.idle_on_mask = BD71828_MASK_IDLE_EN,

			.suspend_on_mask = BD71828_MASK_SUSP_EN,

			.lpsr_on_mask = BD71828_MASK_LPSR_EN,
@@ -614,13 +575,7 @@ static const struct bd71828_regulator_data bd71828_rdata[] = { 
				     ROHM_DVS_LEVEL_SUSPEND |

				     ROHM_DVS_LEVEL_LPSR,

			.run_reg = BD71828_REG_LDO4_VOLT,

			.idle_reg = BD71828_REG_LDO4_VOLT,

			.suspend_reg = BD71828_REG_LDO4_VOLT,

			.lpsr_reg = BD71828_REG_LDO4_VOLT,

			.run_mask = BD71828_MASK_LDO_VOLT,

			.idle_mask = BD71828_MASK_LDO_VOLT,

			.suspend_mask = BD71828_MASK_LDO_VOLT,

			.lpsr_mask = BD71828_MASK_LDO_VOLT,

			.idle_on_mask = BD71828_MASK_IDLE_EN,

			.suspend_on_mask = BD71828_MASK_SUSP_EN,

			.lpsr_on_mask = BD71828_MASK_LPSR_EN,
@@ -655,13 +610,7 @@ static const struct bd71828_regulator_data bd71828_rdata[] = { 
				     ROHM_DVS_LEVEL_SUSPEND |

				     ROHM_DVS_LEVEL_LPSR,

			.run_reg = BD71828_REG_LDO5_VOLT,

			.idle_reg = BD71828_REG_LDO5_VOLT,

			.suspend_reg = BD71828_REG_LDO5_VOLT,

			.lpsr_reg = BD71828_REG_LDO5_VOLT,

			.run_mask = BD71828_MASK_LDO_VOLT,

			.idle_mask = BD71828_MASK_LDO_VOLT,

			.suspend_mask = BD71828_MASK_LDO_VOLT,

			.lpsr_mask = BD71828_MASK_LDO_VOLT,

			.idle_on_mask = BD71828_MASK_IDLE_EN,

			.suspend_on_mask = BD71828_MASK_SUSP_EN,

			.lpsr_on_mask = BD71828_MASK_LPSR_EN,
@@ -720,9 +669,6 @@ static const struct bd71828_regulator_data bd71828_rdata[] = { 
			.suspend_reg = BD71828_REG_LDO7_VOLT,

			.lpsr_reg = BD71828_REG_LDO7_VOLT,

			.run_mask = BD71828_MASK_LDO_VOLT,

			.idle_mask = BD71828_MASK_LDO_VOLT,

			.suspend_mask = BD71828_MASK_LDO_VOLT,

			.lpsr_mask = BD71828_MASK_LDO_VOLT,

			.idle_on_mask = BD71828_MASK_IDLE_EN,

			.suspend_on_mask = BD71828_MASK_SUSP_EN,

			.lpsr_on_mask = BD71828_MASK_LPSR_EN,

drivers/regulator/helpers.c

+30 −13
Original line number Diff line number Diff line
@@ -161,6 +161,32 @@ int regulator_get_voltage_sel_pickable_regmap(struct regulator_dev *rdev) 
}

EXPORT_SYMBOL_GPL(regulator_get_voltage_sel_pickable_regmap);



static int write_separate_vsel_and_range(struct regulator_dev *rdev,

					 unsigned int sel, unsigned int range)

{

	bool range_updated;

	int ret;



	ret = regmap_update_bits_base(rdev->regmap, rdev->desc->vsel_range_reg,

				      rdev->desc->vsel_range_mask,

				      range, &range_updated, false, false);

	if (ret)

		return ret;



	/*

	 * Some PMICs treat the vsel_reg same as apply-bit. Force it to be

	 * written if the range changed, even if the old selector was same as

	 * the new one

	 */

	if (rdev->desc->range_applied_by_vsel && range_updated)

		return regmap_write_bits(rdev->regmap,

					rdev->desc->vsel_reg,

					rdev->desc->vsel_mask, sel);



	return regmap_update_bits(rdev->regmap, rdev->desc->vsel_reg,

				  rdev->desc->vsel_mask, sel);

}



/**

 * regulator_set_voltage_sel_pickable_regmap - pickable range set_voltage_sel

 *
@@ -199,21 +225,12 @@ int regulator_set_voltage_sel_pickable_regmap(struct regulator_dev *rdev, 
	range = rdev->desc->linear_range_selectors_bitfield[i];

	range <<= ffs(rdev->desc->vsel_range_mask) - 1;



	if (rdev->desc->vsel_reg == rdev->desc->vsel_range_reg) {

		ret = regmap_update_bits(rdev->regmap,

					 rdev->desc->vsel_reg,

	if (rdev->desc->vsel_reg == rdev->desc->vsel_range_reg)

		ret = regmap_update_bits(rdev->regmap, rdev->desc->vsel_reg,

					 rdev->desc->vsel_range_mask |

					 rdev->desc->vsel_mask, sel | range);

	} else {

		ret = regmap_update_bits(rdev->regmap,

					 rdev->desc->vsel_range_reg,

					 rdev->desc->vsel_range_mask, range);

		if (ret)

			return ret;



		ret = regmap_update_bits(rdev->regmap, rdev->desc->vsel_reg,

				  rdev->desc->vsel_mask, sel);

	}

	else

		ret = write_separate_vsel_and_range(rdev, sel, range);



	if (ret)

		return ret;

drivers/regulator/rohm-regulator.c

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ static int set_dvs_level(const struct regulator_desc *desc, 
			continue;

		if (ret == uv) {

			i <<= ffs(desc->vsel_mask) - 1;



			ret = regmap_update_bits(regmap, reg, mask, i);

			if (omask && !ret)

				ret = regmap_update_bits(regmap, oreg, omask,
@@ -53,6 +54,9 @@ static int set_dvs_level(const struct regulator_desc *desc, 
			break;

		}

	}

	if (i == desc->n_voltages)

		pr_warn("Unsupported %s voltage %u\n", prop, uv);



	return ret;

}

drivers/regulator/tps6287x-regulator.c

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ static struct regulator_desc tps6287x_reg = { 
	.vsel_mask = 0xFF,

	.vsel_range_reg = TPS6287X_CTRL2,

	.vsel_range_mask = TPS6287X_CTRL2_VRANGE,

	.range_applied_by_vsel = true,

	.ramp_reg = TPS6287X_CTRL1,

	.ramp_mask = TPS6287X_CTRL1_VRAMP,

	.ramp_delay_table = tps6287x_ramp_table,

drivers/regulator/tps6594-regulator.c

+8 −8
Original line number Diff line number Diff line
@@ -400,30 +400,30 @@ static struct tps6594_regulator_irq_type *tps65224_ldos_irq_types[] = { 
static const struct regulator_desc tps6594_multi_regs[] = {

	TPS6594_REGULATOR("BUCK12", "buck12", TPS6594_BUCK_1,

			  REGULATOR_VOLTAGE, tps6594_bucks_ops, TPS6594_MASK_BUCKS_VSET,

			  TPS6594_REG_BUCKX_VOUT_1(1),

			  TPS6594_REG_BUCKX_VOUT_1(0),

			  TPS6594_MASK_BUCKS_VSET,

			  TPS6594_REG_BUCKX_CTRL(1),

			  TPS6594_REG_BUCKX_CTRL(0),

			  TPS6594_BIT_BUCK_EN, 0, 0, bucks_ranges,

			  4, 4000, 0, NULL, 0, 0),

	TPS6594_REGULATOR("BUCK34", "buck34", TPS6594_BUCK_3,

			  REGULATOR_VOLTAGE, tps6594_bucks_ops, TPS6594_MASK_BUCKS_VSET,

			  TPS6594_REG_BUCKX_VOUT_1(3),

			  TPS6594_REG_BUCKX_VOUT_1(2),

			  TPS6594_MASK_BUCKS_VSET,

			  TPS6594_REG_BUCKX_CTRL(3),

			  TPS6594_REG_BUCKX_CTRL(2),

			  TPS6594_BIT_BUCK_EN, 0, 0, bucks_ranges,

			  4, 0, 0, NULL, 0, 0),

	TPS6594_REGULATOR("BUCK123", "buck123", TPS6594_BUCK_1,

			  REGULATOR_VOLTAGE, tps6594_bucks_ops, TPS6594_MASK_BUCKS_VSET,

			  TPS6594_REG_BUCKX_VOUT_1(1),

			  TPS6594_REG_BUCKX_VOUT_1(0),

			  TPS6594_MASK_BUCKS_VSET,

			  TPS6594_REG_BUCKX_CTRL(1),

			  TPS6594_REG_BUCKX_CTRL(0),

			  TPS6594_BIT_BUCK_EN, 0, 0, bucks_ranges,

			  4, 4000, 0, NULL, 0, 0),

	TPS6594_REGULATOR("BUCK1234", "buck1234", TPS6594_BUCK_1,

			  REGULATOR_VOLTAGE, tps6594_bucks_ops, TPS6594_MASK_BUCKS_VSET,

			  TPS6594_REG_BUCKX_VOUT_1(1),

			  TPS6594_REG_BUCKX_VOUT_1(0),

			  TPS6594_MASK_BUCKS_VSET,

			  TPS6594_REG_BUCKX_CTRL(1),

			  TPS6594_REG_BUCKX_CTRL(0),

			  TPS6594_BIT_BUCK_EN, 0, 0, bucks_ranges,

			  4, 4000, 0, NULL, 0, 0),

};