regulator: axp20x: AXP717: dcdc4 doesn't have delay

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>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Link: https://patch.msgid.link/20250318205147.42850-1-simons.philippe@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c
index dca99cfb7cbb8aa62c20da4683b7a003ce1c0b94..da891415efc0b398f87231af3ee0638c5f933255 100644 (file)
--- 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)),