torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

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

Browse Source 
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>
This commit is contained in:
Philippe Simons 2025-03-18 21:51:47 +01:00 committed by Mark Brown
parent 5e9491370a
commit c94764d3f4
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/regulator/axp20x-regulator.c
View File

@ -371,8 +371,8 @@
.ops = &axp20x_ops, \ .ops = &axp20x_ops, \
} }
#define AXP_DESC_DELAY(_family, _id, _match, _supply, _min, _max, _step, _vreg, \ #define AXP_DESC(_family, _id, _match, _supply, _min, _max, _step, _vreg, \
_vmask, _ereg, _emask, _ramp_delay) \ _vmask, _ereg, _emask) \
[_family##_##_id] = { \ [_family##_##_id] = { \
.name = (_match), \ .name = (_match), \
.supply_name = (_supply), \ .supply_name = (_supply), \
@ -388,15 +388,9 @@
.vsel_mask = (_vmask), \ .vsel_mask = (_vmask), \
.enable_reg = (_ereg), \ .enable_reg = (_ereg), \
.enable_mask = (_emask), \ .enable_mask = (_emask), \
.ramp_delay = (_ramp_delay), \
.ops = &axp20x_ops, \ .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) \ #define AXP_DESC_SW(_family, _id, _match, _supply, _ereg, _emask) \
[_family##_##_id] = { \ [_family##_##_id] = { \
.name = (_match), \ .name = (_match), \
@ -805,9 +799,9 @@ static const struct regulator_desc axp717_regulators[] = {
axp717_dcdc3_ranges, AXP717_DCDC3_NUM_VOLTAGES, axp717_dcdc3_ranges, AXP717_DCDC3_NUM_VOLTAGES,
AXP717_DCDC3_CONTROL, AXP717_DCDC_V_OUT_MASK, AXP717_DCDC3_CONTROL, AXP717_DCDC_V_OUT_MASK,
AXP717_DCDC_OUTPUT_CONTROL, BIT(2), 640), 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_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, AXP_DESC(AXP717, ALDO1, "aldo1", "aldoin", 500, 3500, 100,
AXP717_ALDO1_CONTROL, AXP717_LDO_V_OUT_MASK, AXP717_ALDO1_CONTROL, AXP717_LDO_V_OUT_MASK,
AXP717_LDO0_OUTPUT_CONTROL, BIT(0)), AXP717_LDO0_OUTPUT_CONTROL, BIT(0)),