mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
regulator: axp20x: fix LDO2/4 description
[ Upstream commitfbb5a79d2f
] Currently we wrongly set the mask of value of LDO2/4 both to the mask of LDO2, and the LDO4 voltage configuration is left untouched. This leads to conflict when LDO2/4 are both in use. Fix this issue by setting different vsel_mask to both regulators. Fixes:db4a555f7c
("regulator: axp20x: use defines for masks") Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Link: https://lore.kernel.org/r/20200923005142.147135-1-icenowy@aosc.io Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
5c58104841
commit
87f7a4910e
1 changed files with 4 additions and 3 deletions
|
@ -42,8 +42,9 @@
|
|||
|
||||
#define AXP20X_DCDC2_V_OUT_MASK GENMASK(5, 0)
|
||||
#define AXP20X_DCDC3_V_OUT_MASK GENMASK(7, 0)
|
||||
#define AXP20X_LDO24_V_OUT_MASK GENMASK(7, 4)
|
||||
#define AXP20X_LDO2_V_OUT_MASK GENMASK(7, 4)
|
||||
#define AXP20X_LDO3_V_OUT_MASK GENMASK(6, 0)
|
||||
#define AXP20X_LDO4_V_OUT_MASK GENMASK(3, 0)
|
||||
#define AXP20X_LDO5_V_OUT_MASK GENMASK(7, 4)
|
||||
|
||||
#define AXP20X_PWR_OUT_EXTEN_MASK BIT_MASK(0)
|
||||
|
@ -544,14 +545,14 @@ static const struct regulator_desc axp20x_regulators[] = {
|
|||
AXP20X_PWR_OUT_CTRL, AXP20X_PWR_OUT_DCDC3_MASK),
|
||||
AXP_DESC_FIXED(AXP20X, LDO1, "ldo1", "acin", 1300),
|
||||
AXP_DESC(AXP20X, LDO2, "ldo2", "ldo24in", 1800, 3300, 100,
|
||||
AXP20X_LDO24_V_OUT, AXP20X_LDO24_V_OUT_MASK,
|
||||
AXP20X_LDO24_V_OUT, AXP20X_LDO2_V_OUT_MASK,
|
||||
AXP20X_PWR_OUT_CTRL, AXP20X_PWR_OUT_LDO2_MASK),
|
||||
AXP_DESC(AXP20X, LDO3, "ldo3", "ldo3in", 700, 3500, 25,
|
||||
AXP20X_LDO3_V_OUT, AXP20X_LDO3_V_OUT_MASK,
|
||||
AXP20X_PWR_OUT_CTRL, AXP20X_PWR_OUT_LDO3_MASK),
|
||||
AXP_DESC_RANGES(AXP20X, LDO4, "ldo4", "ldo24in",
|
||||
axp20x_ldo4_ranges, AXP20X_LDO4_V_OUT_NUM_VOLTAGES,
|
||||
AXP20X_LDO24_V_OUT, AXP20X_LDO24_V_OUT_MASK,
|
||||
AXP20X_LDO24_V_OUT, AXP20X_LDO4_V_OUT_MASK,
|
||||
AXP20X_PWR_OUT_CTRL, AXP20X_PWR_OUT_LDO4_MASK),
|
||||
AXP_DESC_IO(AXP20X, LDO5, "ldo5", "ldo5in", 1800, 3300, 100,
|
||||
AXP20X_LDO5_V_OUT, AXP20X_LDO5_V_OUT_MASK,
|
||||
|
|
Loading…
Reference in a new issue