| From 9748b827b1d3b9d775df34c9d64fbf4257b95a25 Mon Sep 17 00:00:00 2001 |
| From: Chen-Yu Tsai <wens@csie.org> |
| Date: Wed, 18 Dec 2019 12:47:20 +0800 |
| Subject: [PATCH] regulator: axp20x: Fix AXP22x ELDO2 regulator enable bitmask |
| |
| commit f40ddaa059fdfb472e3aeb733c6220d8e0633a47 upstream. |
| |
| 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. |
| |
| Fixes: db4a555f7c4c ("regulator: axp20x: use defines for masks") |
| Signed-off-by: Chen-Yu Tsai <wens@csie.org> |
| Link: https://lore.kernel.org/r/20191218044720.21990-1-wens@kernel.org |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c |
| index 501cccc806d5..16f0c8570036 100644 |
| --- a/drivers/regulator/axp20x-regulator.c |
| +++ b/drivers/regulator/axp20x-regulator.c |
| @@ -608,7 +608,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), |
| -- |
| 2.7.4 |
| |
