Skip to contentSkip to conversation

regulator: axp20x: fix DCDCB and BLDO2 definitions for AXP806

PATCH Superseded [email protected] 2 participants 2 messages Feb 18, 2019

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 regulator: axp20x: fix DCDCB and BLDO2 definitions for AXP806

From: Ondrej Jirman <[email protected]>

This fixes another set of errors from the refactoring of literals to mask preproccesor definitions.

Found by debugging a broken voltage setup on Orange Pi One Plus.

Fixes db4a555f7c4cf ("regulator: axp20x: use defines for masks")

---
This is a regression introduced during a 5.0 release cycle.

 drivers/regulator/axp20x-regulator.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/regulator/axp20x-regulator.c +2 -2
index 1b51d557ab55..62243957bd19 100644
@@ -791,7 +791,7 @@ static const struct regulator_desc axp806_regulators[] = {
 			AXP806_DCDCA_V_CTRL, AXP806_DCDCA_V_CTRL_MASK,
 			AXP806_PWR_OUT_CTRL1, AXP806_PWR_OUT_DCDCA_MASK),
 	AXP_DESC(AXP806, DCDCB, "dcdcb", "vinb", 1000, 2550, 50,
-		 AXP806_DCDCB_V_CTRL, AXP806_DCDCB_V_CTRL,
+		 AXP806_DCDCB_V_CTRL, AXP806_DCDCB_V_CTRL_MASK,
 		 AXP806_PWR_OUT_CTRL1, AXP806_PWR_OUT_DCDCB_MASK),
 	AXP_DESC_RANGES(AXP806, DCDCC, "dcdcc", "vinc",
 			axp806_dcdca_ranges, AXP806_DCDCA_NUM_VOLTAGES,
@@ -817,7 +817,7 @@ static const struct regulator_desc axp806_regulators[] = {
 		 AXP806_BLDO1_V_CTRL, AXP806_BLDO1_V_CTRL_MASK,
 		 AXP806_PWR_OUT_CTRL2, AXP806_PWR_OUT_BLDO1_MASK),
 	AXP_DESC(AXP806, BLDO2, "bldo2", "bldoin", 700, 1900, 100,
-		 AXP806_BLDO2_V_CTRL, AXP806_BLDO2_V_CTRL,
+		 AXP806_BLDO2_V_CTRL, AXP806_BLDO2_V_CTRL_MASK,
 		 AXP806_PWR_OUT_CTRL2, AXP806_PWR_OUT_BLDO2_MASK),
 	AXP_DESC(AXP806, BLDO3, "bldo3", "bldoin", 700, 1900, 100,
 		 AXP806_BLDO3_V_CTRL, AXP806_BLDO3_V_CTRL_MASK,
Signature · 1 line
2.20.1
Acked-by on v1 1/1
#1 lore raw
Quoted 10 lines · On Mon, Feb 18, 2019 at 9:01 AM <[email protected]> wrote:

From: Ondrej Jirman <[email protected]>

This fixes another set of errors from the refactoring of literals to mask preproccesor definitions.

Found by debugging a broken voltage setup on Orange Pi One Plus.

Fixes db4a555f7c4cf ("regulator: axp20x: use defines for masks")

The first hunk is also covered by a patch from Rask Ingemann Lambertsen.