Skip to content

Commit c94764d

Browse files
loki666broonie
authored andcommitted
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>
1 parent 5e94913 commit c94764d

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

drivers/regulator/axp20x-regulator.c

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,8 @@
371371
.ops = &axp20x_ops, \
372372
}
373373

374-
#define AXP_DESC_DELAY(_family, _id, _match, _supply, _min, _max, _step, _vreg, \
375-
_vmask, _ereg, _emask, _ramp_delay) \
374+
#define AXP_DESC(_family, _id, _match, _supply, _min, _max, _step, _vreg, \
375+
_vmask, _ereg, _emask) \
376376
[_family##_##_id] = { \
377377
.name = (_match), \
378378
.supply_name = (_supply), \
@@ -388,15 +388,9 @@
388388
.vsel_mask = (_vmask), \
389389
.enable_reg = (_ereg), \
390390
.enable_mask = (_emask), \
391-
.ramp_delay = (_ramp_delay), \
392391
.ops = &axp20x_ops, \
393392
}
394393

395-
#define AXP_DESC(_family, _id, _match, _supply, _min, _max, _step, _vreg, \
396-
_vmask, _ereg, _emask) \
397-
AXP_DESC_DELAY(_family, _id, _match, _supply, _min, _max, _step, _vreg, \
398-
_vmask, _ereg, _emask, 0)
399-
400394
#define AXP_DESC_SW(_family, _id, _match, _supply, _ereg, _emask) \
401395
[_family##_##_id] = { \
402396
.name = (_match), \
@@ -805,9 +799,9 @@ static const struct regulator_desc axp717_regulators[] = {
805799
axp717_dcdc3_ranges, AXP717_DCDC3_NUM_VOLTAGES,
806800
AXP717_DCDC3_CONTROL, AXP717_DCDC_V_OUT_MASK,
807801
AXP717_DCDC_OUTPUT_CONTROL, BIT(2), 640),
808-
AXP_DESC_DELAY(AXP717, DCDC4, "dcdc4", "vin4", 1000, 3700, 100,
802+
AXP_DESC(AXP717, DCDC4, "dcdc4", "vin4", 1000, 3700, 100,
809803
AXP717_DCDC4_CONTROL, AXP717_DCDC_V_OUT_MASK,
810-
AXP717_DCDC_OUTPUT_CONTROL, BIT(3), 6400),
804+
AXP717_DCDC_OUTPUT_CONTROL, BIT(3)),
811805
AXP_DESC(AXP717, ALDO1, "aldo1", "aldoin", 500, 3500, 100,
812806
AXP717_ALDO1_CONTROL, AXP717_LDO_V_OUT_MASK,
813807
AXP717_LDO0_OUTPUT_CONTROL, BIT(0)),

0 commit comments

Comments
 (0)