linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] regulator: axp20x: Fix incorrect vsel_mask settings
@ 2019-01-28 14:02 Axel Lin
  2019-02-06 10:44 ` Chen-Yu Tsai
  0 siblings, 1 reply; 4+ messages in thread
From: Axel Lin @ 2019-01-28 14:02 UTC (permalink / raw)
  To: Mark Brown; +Cc: Chen-Yu Tsai, Liam Girdwood, linux-kernel, Axel Lin

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>
---
 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


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] regulator: axp20x: Fix incorrect vsel_mask settings
  2019-01-28 14:02 [PATCH] regulator: axp20x: Fix incorrect vsel_mask settings Axel Lin
@ 2019-02-06 10:44 ` Chen-Yu Tsai
  2019-02-06 14:47   ` Axel Lin
  0 siblings, 1 reply; 4+ messages in thread
From: Chen-Yu Tsai @ 2019-02-06 10:44 UTC (permalink / raw)
  To: Axel Lin; +Cc: Mark Brown, Liam Girdwood, linux-kernel

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
>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] regulator: axp20x: Fix incorrect vsel_mask settings
  2019-02-06 10:44 ` Chen-Yu Tsai
@ 2019-02-06 14:47   ` Axel Lin
  2019-02-06 15:13     ` Chen-Yu Tsai
  0 siblings, 1 reply; 4+ messages in thread
From: Axel Lin @ 2019-02-06 14:47 UTC (permalink / raw)
  To: Chen-Yu Tsai; +Cc: Mark Brown, Liam Girdwood, linux-kernel

Chen-Yu Tsai <wens@csie.org> 於 2019年2月6日 週三 下午6:44寫道:
>
> 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?

This is similar fix but fixes different places.
BTW, Mark already applied both patches.

Regards,
Axel

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] regulator: axp20x: Fix incorrect vsel_mask settings
  2019-02-06 14:47   ` Axel Lin
@ 2019-02-06 15:13     ` Chen-Yu Tsai
  0 siblings, 0 replies; 4+ messages in thread
From: Chen-Yu Tsai @ 2019-02-06 15:13 UTC (permalink / raw)
  To: Axel Lin; +Cc: Mark Brown, Liam Girdwood, linux-kernel

On Wed, Feb 6, 2019 at 10:47 PM Axel Lin <axel.lin@ingics.com> wrote:
>
> Chen-Yu Tsai <wens@csie.org> 於 2019年2月6日 週三 下午6:44寫道:
> >
> > 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?
>
> This is similar fix but fixes different places.
> BTW, Mark already applied both patches.

You're right. Sorry for the noise.

ChenYu

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2019-02-06 15:14 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-28 14:02 [PATCH] regulator: axp20x: Fix incorrect vsel_mask settings Axel Lin
2019-02-06 10:44 ` Chen-Yu Tsai
2019-02-06 14:47   ` Axel Lin
2019-02-06 15:13     ` Chen-Yu Tsai

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).