]> git.itanic.dy.fi Git - linux-stable/commitdiff
regulator: axp20x: fix DCDCB and BLDO2 definitions for AXP806
authorOndrej Jirman <megous@megous.com>
Mon, 18 Feb 2019 01:01:20 +0000 (02:01 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 18 Feb 2019 17:09:47 +0000 (17:09 +0000)
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")
Signed-off-by: Ondrej Jirman <megous@megous.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/regulator/axp20x-regulator.c

index 1b51d557ab5510f6f6d4abe4dba9999b32e0324d..62243957bd195850ab0abe62c5f0a583ae547c25 100644 (file)
@@ -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,