regulator: axp20x: Fix AXP22x ELDO2 regulator enable bitmask
Chen-Yu Tsai
maintainerPATCH RESEND 1/1 regulator: axp20x: Fix AXP22x ELDO2 regulator enable bitmask
From: Chen-Yu Tsai <[email protected]>
A copy-paste error was introduced when bitmasks were converted to macros, incorrectly setting the enable bitmask for ELDO2 to the one for ELDO1 for the AXP22x units.
Fix it by using the correct macro.
On affected boards, ELDO1 and/or ELDO2 are used to power the camera, which is currently unsupported.
---
(Originally sent before v5.5-rc1 was tagged.)
Small fix. Patches [1] supporting the camera sensor interface on the Allwinner R40 based BPI-M2U board depend on this at runtime to power on the camera correctly.
[1] https://patchwork.kernel.org/project/linux-arm-kernel/list/?series=217057
--- drivers/regulator/axp20x-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/axp20x-regulator.c +1 -1
@@ -605,7 +605,7 @@ static const struct regulator_desc axp22x_regulators[] = { AXP22X_PWR_OUT_CTRL2, AXP22X_PWR_OUT_ELDO1_MASK),AXP_DESC (AXP22X ,ELDO2 ,"eldo2" ,"eldoin" ,700 ,3300 ,100 ,AXP22X_ELDO2_V_OUT ,AXP22X_ELDO2_V_OUT_MASK , -AXP22X_PWR_OUT_CTRL2 ,AXP22X_PWR_OUT_ELDO1_MASK ), +AXP22X_PWR_OUT_CTRL2 ,AXP22X_PWR_OUT_ELDO2_MASK ),AXP_DESC (AXP22X ,ELDO3 ,"eldo3" ,"eldoin" ,700 ,3300 ,100 ,AXP22X_ELDO3_V_OUT ,AXP22X_ELDO3_V_OUT_MASK , AXP22X_PWR_OUT_CTRL2, AXP22X_PWR_OUT_ELDO3_MASK),
Signature · 1 line
2.24.0
Mark Brown
maintainerApplied "regulator: axp20x: Fix AXP22x ELDO2 regulator enable bitmask" to the regulator tree
The patch
regulator: axp20x: Fix AXP22x ELDO2 regulator enable bitmask
has been applied to the regulator tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-5.5
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 f40ddaa059fdfb472e3aeb733c6220d8e0633a47 Mon Sep 17 00:00:00 2001
From: Chen-Yu Tsai <[email protected]>
Date: Wed, 18 Dec 2019 12:47:20 +0800
Subject: [PATCH] regulator: axp20x: Fix AXP22x ELDO2 regulator enable bitmask
A copy-paste error was introduced when bitmasks were converted to macros, incorrectly setting the enable bitmask for ELDO2 to the one for ELDO1 for the AXP22x units.
Fix it by using the correct macro.
On affected boards, ELDO1 and/or ELDO2 are used to power the camera, which is currently unsupported.
--- drivers/regulator/axp20x-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/axp20x-regulator.c +1 -1
@@ -605,7 +605,7 @@ static const struct regulator_desc axp22x_regulators[] = { AXP22X_PWR_OUT_CTRL2, AXP22X_PWR_OUT_ELDO1_MASK),AXP_DESC (AXP22X ,ELDO2 ,"eldo2" ,"eldoin" ,700 ,3300 ,100 ,AXP22X_ELDO2_V_OUT ,AXP22X_ELDO2_V_OUT_MASK , -AXP22X_PWR_OUT_CTRL2 ,AXP22X_PWR_OUT_ELDO1_MASK ), +AXP22X_PWR_OUT_CTRL2 ,AXP22X_PWR_OUT_ELDO2_MASK ),AXP_DESC (AXP22X ,ELDO3 ,"eldo3" ,"eldoin" ,700 ,3300 ,100 ,AXP22X_ELDO3_V_OUT ,AXP22X_ELDO3_V_OUT_MASK , AXP22X_PWR_OUT_CTRL2, AXP22X_PWR_OUT_ELDO3_MASK),
Signature · 1 line
2.20.1