Messages in this thread | | | From | Vasily Khoruzhick <> | Date | Sun, 3 Feb 2019 15:02:51 -0800 | Subject | Re: Applied "regulator: axp20x: fix ALDO2, DLDO2 and ELDO3 definitions for AXP803" to the regulator tree |
| |
Hey Mark,
Could you please apply it into your for-5.0 branch? It's a fix for a regression and without this patch axp803 is broken in 5.0.
Regards, Vasily
On Mon, Jan 28, 2019 at 4:35 AM Mark Brown <broonie@kernel.org> wrote: > > The patch > > regulator: axp20x: fix ALDO2, DLDO2 and ELDO3 definitions for AXP803 > > has been applied to the regulator tree at > > https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git > > All being well this means that it will be integrated into the linux-next > tree (usually sometime in the next 24 hours) and sent to Linus during > the next merge window (or sooner if it is a bug fix), however if > problems are discovered then the patch may be dropped or reverted. > > You may get further e-mails resulting from automated or manual testing > and review of the tree, please engage with people reporting problems and > send followup patches addressing any issues that are reported if needed. > > If any updates are required or you are submitting further changes they > should be sent as incremental updates against current git, existing > patches will not be replaced. > > Please add any relevant lists and maintainers to the CCs when replying > to this mail. > > Thanks, > Mark > > From 252d1c20551b745f33a490892335d2b09f5d48a7 Mon Sep 17 00:00:00 2001 > From: Vasily Khoruzhick <anarsoul@gmail.com> > Date: Fri, 25 Jan 2019 22:18:09 -0800 > Subject: [PATCH] regulator: axp20x: fix ALDO2, DLDO2 and ELDO3 definitions for > AXP803 > > Looks like refactoring didn't go well and left ALDO2, DLDO2 and ELDO3 > definitions broken for AXP803 - now they are using register address > instead of mask. Fix it by using mask where necessary. > > Fixes: db4a555f7c4cf ("regulator: axp20x: use defines for masks") > Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> > Reviewed-by: Chen-Yu Tsai <wens@csie.org> > Signed-off-by: Mark Brown <broonie@kernel.org> > --- > drivers/regulator/axp20x-regulator.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c > index 0dfa4ea6bbdf..087cadb96fab 100644 > --- a/drivers/regulator/axp20x-regulator.c > +++ b/drivers/regulator/axp20x-regulator.c > @@ -723,7 +723,7 @@ static const struct regulator_desc axp803_regulators[] = { > AXP22X_ALDO1_V_OUT, AXP22X_ALDO1_V_OUT_MASK, > AXP22X_PWR_OUT_CTRL3, AXP806_PWR_OUT_ALDO1_MASK), > AXP_DESC(AXP803, 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(AXP803, ALDO3, "aldo3", "aldoin", 700, 3300, 100, > AXP22X_ALDO3_V_OUT, AXP22X_ALDO3_V_OUT_MASK, > @@ -733,7 +733,7 @@ static const struct regulator_desc axp803_regulators[] = { > AXP22X_PWR_OUT_CTRL2, AXP22X_PWR_OUT_DLDO1_MASK), > AXP_DESC_RANGES(AXP803, 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(AXP803, DLDO3, "dldo3", "dldoin", 700, 3300, 100, > AXP22X_DLDO3_V_OUT, AXP22X_DLDO3_V_OUT_MASK, > @@ -748,7 +748,7 @@ static const struct regulator_desc axp803_regulators[] = { > AXP22X_ELDO2_V_OUT, AXP22X_ELDO2_V_OUT_MASK, > AXP22X_PWR_OUT_CTRL2, AXP22X_PWR_OUT_ELDO2_MASK), > AXP_DESC(AXP803, 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), > AXP_DESC(AXP803, FLDO1, "fldo1", "fldoin", 700, 1450, 50, > AXP803_FLDO1_V_OUT, AXP803_FLDO1_V_OUT_MASK, > -- > 2.20.1 >
| |