Messages in this thread | | | From | Chen-Yu Tsai <> | Date | Wed, 6 Feb 2019 18:44:35 +0800 | Subject | Re: [PATCH] regulator: axp20x: Fix incorrect vsel_mask settings |
| |
On Mon, Jan 28, 2019 at 10:02 PM Axel Lin <axel.lin@ingics.com> wrote: > > Fix copy-paste mistake while converting to use defines for masks. > > Fixes: db4a555f7c4cf ("regulator: axp20x: use defines for masks") > Signed-off-by: Axel Lin <axel.lin@ingics.com>
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Though I believe the latter three have already been fixed by
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git/commit/?h=for-5.0&id=16c8a595740035c4a7ede608a60b4a59f67b76e6
Could you respin this patch on top of that commit?
ChenYu
> --- > drivers/regulator/axp20x-regulator.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c > index 087cadb96fab..6d081c8321a1 100644 > --- a/drivers/regulator/axp20x-regulator.c > +++ b/drivers/regulator/axp20x-regulator.c > @@ -577,7 +577,7 @@ static const struct regulator_desc axp22x_regulators[] = { > AXP22X_DCDC3_V_OUT, AXP22X_DCDC3_V_OUT_MASK, > AXP22X_PWR_OUT_CTRL1, AXP22X_PWR_OUT_DCDC3_MASK), > AXP_DESC(AXP22X, DCDC4, "dcdc4", "vin4", 600, 1540, 20, > - AXP22X_DCDC4_V_OUT, AXP22X_DCDC4_V_OUT, > + AXP22X_DCDC4_V_OUT, AXP22X_DCDC4_V_OUT_MASK, > AXP22X_PWR_OUT_CTRL1, AXP22X_PWR_OUT_DCDC4_MASK), > AXP_DESC(AXP22X, DCDC5, "dcdc5", "vin5", 1000, 2550, 50, > AXP22X_DCDC5_V_OUT, AXP22X_DCDC5_V_OUT_MASK, > @@ -956,7 +956,7 @@ static const struct regulator_desc axp813_regulators[] = { > AXP22X_ALDO1_V_OUT, AXP22X_ALDO1_V_OUT_MASK, > AXP22X_PWR_OUT_CTRL3, AXP806_PWR_OUT_ALDO1_MASK), > AXP_DESC(AXP813, ALDO2, "aldo2", "aldoin", 700, 3300, 100, > - AXP22X_ALDO2_V_OUT, AXP22X_ALDO2_V_OUT, > + AXP22X_ALDO2_V_OUT, AXP22X_ALDO2_V_OUT_MASK, > AXP22X_PWR_OUT_CTRL3, AXP806_PWR_OUT_ALDO2_MASK), > AXP_DESC(AXP813, ALDO3, "aldo3", "aldoin", 700, 3300, 100, > AXP22X_ALDO3_V_OUT, AXP22X_ALDO3_V_OUT_MASK, > @@ -966,7 +966,7 @@ static const struct regulator_desc axp813_regulators[] = { > AXP22X_PWR_OUT_CTRL2, AXP22X_PWR_OUT_DLDO1_MASK), > AXP_DESC_RANGES(AXP813, DLDO2, "dldo2", "dldoin", > axp803_dldo2_ranges, AXP803_DLDO2_NUM_VOLTAGES, > - AXP22X_DLDO2_V_OUT, AXP22X_DLDO2_V_OUT, > + AXP22X_DLDO2_V_OUT, AXP22X_DLDO2_V_OUT_MASK, > AXP22X_PWR_OUT_CTRL2, AXP22X_PWR_OUT_DLDO2_MASK), > AXP_DESC(AXP813, DLDO3, "dldo3", "dldoin", 700, 3300, 100, > AXP22X_DLDO3_V_OUT, AXP22X_DLDO3_V_OUT_MASK, > @@ -981,7 +981,7 @@ static const struct regulator_desc axp813_regulators[] = { > AXP22X_ELDO2_V_OUT, AXP22X_ELDO2_V_OUT_MASK, > AXP22X_PWR_OUT_CTRL2, AXP22X_PWR_OUT_ELDO2_MASK), > AXP_DESC(AXP813, ELDO3, "eldo3", "eldoin", 700, 1900, 50, > - AXP22X_ELDO3_V_OUT, AXP22X_ELDO3_V_OUT, > + AXP22X_ELDO3_V_OUT, AXP22X_ELDO3_V_OUT_MASK, > AXP22X_PWR_OUT_CTRL2, AXP22X_PWR_OUT_ELDO3_MASK), > /* to do / check ... */ > AXP_DESC(AXP813, FLDO1, "fldo1", "fldoin", 700, 1450, 50, > -- > 2.17.1 >
| |