2023-09-19 14:53:30

by Chen-Yu Tsai

[permalink] [raw]
Subject: [PATCH v3 06/12] regulator: mt6358: Use mt6397-regulator.h binding header for buck mode macros

The (undocumented) possible values for the buck operating modes on the
MT6358 are the same as those on the MT6397, both for the device tree
bindings and the actual hardware register values.

Reuse the macros for the MT6397 PMIC in the MT6358 regulator driver by
including the mt6397-regulator.h binding header and replacing the
existing macros. This aligns it with other PMIC.

Signed-off-by: Chen-Yu Tsai <[email protected]>
---
Changes since v2:
- new patch

drivers/regulator/mt6358-regulator.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/regulator/mt6358-regulator.c b/drivers/regulator/mt6358-regulator.c
index 4a6ad0ccf03b..c312e79a0a39 100644
--- a/drivers/regulator/mt6358-regulator.c
+++ b/drivers/regulator/mt6358-regulator.c
@@ -13,8 +13,7 @@
#include <linux/regulator/mt6358-regulator.h>
#include <linux/regulator/of_regulator.h>

-#define MT6358_BUCK_MODE_AUTO 0
-#define MT6358_BUCK_MODE_FORCE_PWM 1
+#include <dt-bindings/regulator/mediatek,mt6397-regulator.h>

/*
* MT6358 regulators' information
@@ -326,7 +325,7 @@ static const struct linear_range vldo28_ranges[] = {

static unsigned int mt6358_map_mode(unsigned int mode)
{
- return mode == MT6358_BUCK_MODE_AUTO ?
+ return mode == MT6397_BUCK_MODE_AUTO ?
REGULATOR_MODE_NORMAL : REGULATOR_MODE_FAST;
}

@@ -374,10 +373,10 @@ static int mt6358_regulator_set_mode(struct regulator_dev *rdev,

switch (mode) {
case REGULATOR_MODE_FAST:
- val = MT6358_BUCK_MODE_FORCE_PWM;
+ val = MT6397_BUCK_MODE_FORCE_PWM;
break;
case REGULATOR_MODE_NORMAL:
- val = MT6358_BUCK_MODE_AUTO;
+ val = MT6397_BUCK_MODE_AUTO;
break;
default:
return -EINVAL;
@@ -408,9 +407,9 @@ static unsigned int mt6358_regulator_get_mode(struct regulator_dev *rdev)
}

switch ((regval & info->modeset_mask) >> (ffs(info->modeset_mask) - 1)) {
- case MT6358_BUCK_MODE_AUTO:
+ case MT6397_BUCK_MODE_AUTO:
return REGULATOR_MODE_NORMAL;
- case MT6358_BUCK_MODE_FORCE_PWM:
+ case MT6397_BUCK_MODE_FORCE_PWM:
return REGULATOR_MODE_FAST;
default:
return -EINVAL;
--
2.42.0.459.ge4e396fd5e-goog


Subject: Re: [PATCH v3 06/12] regulator: mt6358: Use mt6397-regulator.h binding header for buck mode macros

Il 19/09/23 12:43, Chen-Yu Tsai ha scritto:
> The (undocumented) possible values for the buck operating modes on the
> MT6358 are the same as those on the MT6397, both for the device tree
> bindings and the actual hardware register values.
>
> Reuse the macros for the MT6397 PMIC in the MT6358 regulator driver by
> including the mt6397-regulator.h binding header and replacing the
> existing macros. This aligns it with other PMIC.
>
> Signed-off-by: Chen-Yu Tsai <[email protected]>

Reviewed-by: AngeloGioacchino Del Regno <[email protected]>