|
371 | 371 | .ops = &axp20x_ops, \
|
372 | 372 | }
|
373 | 373 |
|
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) \ |
376 | 376 | [_family##_##_id] = { \
|
377 | 377 | .name = (_match), \
|
378 | 378 | .supply_name = (_supply), \
|
|
388 | 388 | .vsel_mask = (_vmask), \
|
389 | 389 | .enable_reg = (_ereg), \
|
390 | 390 | .enable_mask = (_emask), \
|
391 |
| - .ramp_delay = (_ramp_delay), \ |
392 | 391 | .ops = &axp20x_ops, \
|
393 | 392 | }
|
394 | 393 |
|
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 |
| - |
400 | 394 | #define AXP_DESC_SW(_family, _id, _match, _supply, _ereg, _emask) \
|
401 | 395 | [_family##_##_id] = { \
|
402 | 396 | .name = (_match), \
|
@@ -805,9 +799,9 @@ static const struct regulator_desc axp717_regulators[] = {
|
805 | 799 | axp717_dcdc3_ranges, AXP717_DCDC3_NUM_VOLTAGES,
|
806 | 800 | AXP717_DCDC3_CONTROL, AXP717_DCDC_V_OUT_MASK,
|
807 | 801 | 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, |
809 | 803 | AXP717_DCDC4_CONTROL, AXP717_DCDC_V_OUT_MASK,
|
810 |
| - AXP717_DCDC_OUTPUT_CONTROL, BIT(3), 6400), |
| 804 | + AXP717_DCDC_OUTPUT_CONTROL, BIT(3)), |
811 | 805 | AXP_DESC(AXP717, ALDO1, "aldo1", "aldoin", 500, 3500, 100,
|
812 | 806 | AXP717_ALDO1_CONTROL, AXP717_LDO_V_OUT_MASK,
|
813 | 807 | AXP717_LDO0_OUTPUT_CONTROL, BIT(0)),
|
|
0 commit comments