Merge tag 'regulator-fix-v6.10-merge-window' of git://git.kernel.org/pub/scm/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 May 2024 20:39:42 +0000 (13:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 May 2024 20:39:42 +0000 (13:39 -0700)
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

1  2 
drivers/regulator/tps6594-regulator.c

index 9e7886bd414906f6b892e960ecdd5d8f059bc6b4,5fad61785e72f826165a550e29da6bcfc97754a2..4a859f4c0f8358a2f9088daaa30295c3c1561c10
@@@ -384,25 -284,12 +384,25 @@@ static struct tps6594_regulator_irq_typ
        tps6594_ldo4_irq_types,
  };
  
 -static const struct regulator_desc multi_regs[] = {
 +static struct tps6594_regulator_irq_type *tps65224_bucks_irq_types[] = {
 +      tps65224_buck1_irq_types,
 +      tps65224_buck2_irq_types,
 +      tps65224_buck3_irq_types,
 +      tps65224_buck4_irq_types,
 +};
 +
 +static struct tps6594_regulator_irq_type *tps65224_ldos_irq_types[] = {
 +      tps65224_ldo1_irq_types,
 +      tps65224_ldo2_irq_types,
 +      tps65224_ldo3_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,