Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'regulator-fix-v5.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fix from Mark Brown:
"A single fix for incorrect specification of some of the register
fields on axp20x devices which would break voltage setting on affected
systems"
* tag 'regulator-fix-v5.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: axp20x: fix LDO2/4 description
+4
-3
+4
-3
drivers/regulator/axp20x-regulator.c
+4
-3
drivers/regulator/axp20x-regulator.c
···
42
42
43
43
#define AXP20X_DCDC2_V_OUT_MASK GENMASK(5, 0)
44
44
#define AXP20X_DCDC3_V_OUT_MASK GENMASK(7, 0)
45
-
#define AXP20X_LDO24_V_OUT_MASK GENMASK(7, 4)
45
+
#define AXP20X_LDO2_V_OUT_MASK GENMASK(7, 4)
46
46
#define AXP20X_LDO3_V_OUT_MASK GENMASK(6, 0)
47
+
#define AXP20X_LDO4_V_OUT_MASK GENMASK(3, 0)
47
48
#define AXP20X_LDO5_V_OUT_MASK GENMASK(7, 4)
48
49
49
50
#define AXP20X_PWR_OUT_EXTEN_MASK BIT_MASK(0)
···
543
542
AXP20X_PWR_OUT_CTRL, AXP20X_PWR_OUT_DCDC3_MASK),
544
543
AXP_DESC_FIXED(AXP20X, LDO1, "ldo1", "acin", 1300),
545
544
AXP_DESC(AXP20X, LDO2, "ldo2", "ldo24in", 1800, 3300, 100,
546
-
AXP20X_LDO24_V_OUT, AXP20X_LDO24_V_OUT_MASK,
545
+
AXP20X_LDO24_V_OUT, AXP20X_LDO2_V_OUT_MASK,
547
546
AXP20X_PWR_OUT_CTRL, AXP20X_PWR_OUT_LDO2_MASK),
548
547
AXP_DESC(AXP20X, LDO3, "ldo3", "ldo3in", 700, 3500, 25,
549
548
AXP20X_LDO3_V_OUT, AXP20X_LDO3_V_OUT_MASK,
550
549
AXP20X_PWR_OUT_CTRL, AXP20X_PWR_OUT_LDO3_MASK),
551
550
AXP_DESC_RANGES(AXP20X, LDO4, "ldo4", "ldo24in",
552
551
axp20x_ldo4_ranges, AXP20X_LDO4_V_OUT_NUM_VOLTAGES,
553
-
AXP20X_LDO24_V_OUT, AXP20X_LDO24_V_OUT_MASK,
552
+
AXP20X_LDO24_V_OUT, AXP20X_LDO4_V_OUT_MASK,
554
553
AXP20X_PWR_OUT_CTRL, AXP20X_PWR_OUT_LDO4_MASK),
555
554
AXP_DESC_IO(AXP20X, LDO5, "ldo5", "ldo5in", 1800, 3300, 100,
556
555
AXP20X_LDO5_V_OUT, AXP20X_LDO5_V_OUT_MASK,