drivers/regulator/axp20x-regulator.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
According to AXP717 user manual, DCDC4 doesn't have a ramp delay like
DCDC1/2/3 do.
Remove it from the description and cleanup the macros.
Signed-off-by: Philippe Simons <simons.philippe@gmail.com>
---
drivers/regulator/axp20x-regulator.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c
index dca99cfb7cbb..da891415efc0 100644
--- a/drivers/regulator/axp20x-regulator.c
+++ b/drivers/regulator/axp20x-regulator.c
@@ -371,8 +371,8 @@
.ops = &axp20x_ops, \
}
-#define AXP_DESC_DELAY(_family, _id, _match, _supply, _min, _max, _step, _vreg, \
- _vmask, _ereg, _emask, _ramp_delay) \
+#define AXP_DESC(_family, _id, _match, _supply, _min, _max, _step, _vreg, \
+ _vmask, _ereg, _emask) \
[_family##_##_id] = { \
.name = (_match), \
.supply_name = (_supply), \
@@ -388,15 +388,9 @@
.vsel_mask = (_vmask), \
.enable_reg = (_ereg), \
.enable_mask = (_emask), \
- .ramp_delay = (_ramp_delay), \
.ops = &axp20x_ops, \
}
-#define AXP_DESC(_family, _id, _match, _supply, _min, _max, _step, _vreg, \
- _vmask, _ereg, _emask) \
- AXP_DESC_DELAY(_family, _id, _match, _supply, _min, _max, _step, _vreg, \
- _vmask, _ereg, _emask, 0)
-
#define AXP_DESC_SW(_family, _id, _match, _supply, _ereg, _emask) \
[_family##_##_id] = { \
.name = (_match), \
@@ -805,9 +799,9 @@ static const struct regulator_desc axp717_regulators[] = {
axp717_dcdc3_ranges, AXP717_DCDC3_NUM_VOLTAGES,
AXP717_DCDC3_CONTROL, AXP717_DCDC_V_OUT_MASK,
AXP717_DCDC_OUTPUT_CONTROL, BIT(2), 640),
- AXP_DESC_DELAY(AXP717, DCDC4, "dcdc4", "vin4", 1000, 3700, 100,
+ AXP_DESC(AXP717, DCDC4, "dcdc4", "vin4", 1000, 3700, 100,
AXP717_DCDC4_CONTROL, AXP717_DCDC_V_OUT_MASK,
- AXP717_DCDC_OUTPUT_CONTROL, BIT(3), 6400),
+ AXP717_DCDC_OUTPUT_CONTROL, BIT(3)),
AXP_DESC(AXP717, ALDO1, "aldo1", "aldoin", 500, 3500, 100,
AXP717_ALDO1_CONTROL, AXP717_LDO_V_OUT_MASK,
AXP717_LDO0_OUTPUT_CONTROL, BIT(0)),
--
2.48.1On Tue, 18 Mar 2025 21:51:47 +0100, Philippe Simons wrote:
> According to AXP717 user manual, DCDC4 doesn't have a ramp delay like
> DCDC1/2/3 do.
>
> Remove it from the description and cleanup the macros.
>
>
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next
Thanks!
[1/1] regulator: axp20x: AXP717: dcdc4 doesn't have delay
commit: c94764d3f4e503c0c4d56c8f64a8a63645091898
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
On Tue, 18 Mar 2025 21:51:47 +0100
Philippe Simons <simons.philippe@gmail.com> wrote:
Hi,
> According to AXP717 user manual, DCDC4 doesn't have a ramp delay like
> DCDC1/2/3 do.
Yes, all the AXP717 manuals I scanned only mention DCDC1/2/3 for DVM mode,
and DCDC4 has bit 7 (controlling DVM on the other DCDCs) marked as
reserved.
> Remove it from the description and cleanup the macros.
>
> Signed-off-by: Philippe Simons <simons.philippe@gmail.com>
Changes look alright, we indeed don't need AXP_DESC_DELAY anymore.
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Cheers,
Andre
> ---
> drivers/regulator/axp20x-regulator.c | 14 ++++----------
> 1 file changed, 4 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c
> index dca99cfb7cbb..da891415efc0 100644
> --- a/drivers/regulator/axp20x-regulator.c
> +++ b/drivers/regulator/axp20x-regulator.c
> @@ -371,8 +371,8 @@
> .ops = &axp20x_ops, \
> }
>
> -#define AXP_DESC_DELAY(_family, _id, _match, _supply, _min, _max, _step, _vreg, \
> - _vmask, _ereg, _emask, _ramp_delay) \
> +#define AXP_DESC(_family, _id, _match, _supply, _min, _max, _step, _vreg, \
> + _vmask, _ereg, _emask) \
> [_family##_##_id] = { \
> .name = (_match), \
> .supply_name = (_supply), \
> @@ -388,15 +388,9 @@
> .vsel_mask = (_vmask), \
> .enable_reg = (_ereg), \
> .enable_mask = (_emask), \
> - .ramp_delay = (_ramp_delay), \
> .ops = &axp20x_ops, \
> }
>
> -#define AXP_DESC(_family, _id, _match, _supply, _min, _max, _step, _vreg, \
> - _vmask, _ereg, _emask) \
> - AXP_DESC_DELAY(_family, _id, _match, _supply, _min, _max, _step, _vreg, \
> - _vmask, _ereg, _emask, 0)
> -
> #define AXP_DESC_SW(_family, _id, _match, _supply, _ereg, _emask) \
> [_family##_##_id] = { \
> .name = (_match), \
> @@ -805,9 +799,9 @@ static const struct regulator_desc axp717_regulators[] = {
> axp717_dcdc3_ranges, AXP717_DCDC3_NUM_VOLTAGES,
> AXP717_DCDC3_CONTROL, AXP717_DCDC_V_OUT_MASK,
> AXP717_DCDC_OUTPUT_CONTROL, BIT(2), 640),
> - AXP_DESC_DELAY(AXP717, DCDC4, "dcdc4", "vin4", 1000, 3700, 100,
> + AXP_DESC(AXP717, DCDC4, "dcdc4", "vin4", 1000, 3700, 100,
> AXP717_DCDC4_CONTROL, AXP717_DCDC_V_OUT_MASK,
> - AXP717_DCDC_OUTPUT_CONTROL, BIT(3), 6400),
> + AXP717_DCDC_OUTPUT_CONTROL, BIT(3)),
> AXP_DESC(AXP717, ALDO1, "aldo1", "aldoin", 500, 3500, 100,
> AXP717_ALDO1_CONTROL, AXP717_LDO_V_OUT_MASK,
> AXP717_LDO0_OUTPUT_CONTROL, BIT(0)),
On Wed, Mar 19, 2025 at 4:51 AM Philippe Simons
<simons.philippe@gmail.com> wrote:
>
> According to AXP717 user manual, DCDC4 doesn't have a ramp delay like
> DCDC1/2/3 do.
>
> Remove it from the description and cleanup the macros.
>
> Signed-off-by: Philippe Simons <simons.philippe@gmail.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
> ---
> drivers/regulator/axp20x-regulator.c | 14 ++++----------
> 1 file changed, 4 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c
> index dca99cfb7cbb..da891415efc0 100644
> --- a/drivers/regulator/axp20x-regulator.c
> +++ b/drivers/regulator/axp20x-regulator.c
> @@ -371,8 +371,8 @@
> .ops = &axp20x_ops, \
> }
>
> -#define AXP_DESC_DELAY(_family, _id, _match, _supply, _min, _max, _step, _vreg, \
> - _vmask, _ereg, _emask, _ramp_delay) \
> +#define AXP_DESC(_family, _id, _match, _supply, _min, _max, _step, _vreg, \
> + _vmask, _ereg, _emask) \
> [_family##_##_id] = { \
> .name = (_match), \
> .supply_name = (_supply), \
> @@ -388,15 +388,9 @@
> .vsel_mask = (_vmask), \
> .enable_reg = (_ereg), \
> .enable_mask = (_emask), \
> - .ramp_delay = (_ramp_delay), \
> .ops = &axp20x_ops, \
> }
>
> -#define AXP_DESC(_family, _id, _match, _supply, _min, _max, _step, _vreg, \
> - _vmask, _ereg, _emask) \
> - AXP_DESC_DELAY(_family, _id, _match, _supply, _min, _max, _step, _vreg, \
> - _vmask, _ereg, _emask, 0)
> -
> #define AXP_DESC_SW(_family, _id, _match, _supply, _ereg, _emask) \
> [_family##_##_id] = { \
> .name = (_match), \
> @@ -805,9 +799,9 @@ static const struct regulator_desc axp717_regulators[] = {
> axp717_dcdc3_ranges, AXP717_DCDC3_NUM_VOLTAGES,
> AXP717_DCDC3_CONTROL, AXP717_DCDC_V_OUT_MASK,
> AXP717_DCDC_OUTPUT_CONTROL, BIT(2), 640),
> - AXP_DESC_DELAY(AXP717, DCDC4, "dcdc4", "vin4", 1000, 3700, 100,
> + AXP_DESC(AXP717, DCDC4, "dcdc4", "vin4", 1000, 3700, 100,
> AXP717_DCDC4_CONTROL, AXP717_DCDC_V_OUT_MASK,
> - AXP717_DCDC_OUTPUT_CONTROL, BIT(3), 6400),
> + AXP717_DCDC_OUTPUT_CONTROL, BIT(3)),
> AXP_DESC(AXP717, ALDO1, "aldo1", "aldoin", 500, 3500, 100,
> AXP717_ALDO1_CONTROL, AXP717_LDO_V_OUT_MASK,
> AXP717_LDO0_OUTPUT_CONTROL, BIT(0)),
> --
> 2.48.1
>
© 2016 - 2025 Red Hat, Inc.