aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/s2mps11.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index adab82d5279f..697be114e21a 100644
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -479,7 +479,7 @@ static struct regulator_ops s2mps14_reg_ops = {
479 .enable_mask = S2MPS14_ENABLE_MASK \ 479 .enable_mask = S2MPS14_ENABLE_MASK \
480} 480}
481 481
482#define regulator_desc_s2mps14_buck(num, min, step) { \ 482#define regulator_desc_s2mps14_buck(num, min, step, min_sel) { \
483 .name = "BUCK"#num, \ 483 .name = "BUCK"#num, \
484 .id = S2MPS14_BUCK##num, \ 484 .id = S2MPS14_BUCK##num, \
485 .ops = &s2mps14_reg_ops, \ 485 .ops = &s2mps14_reg_ops, \
@@ -488,7 +488,7 @@ static struct regulator_ops s2mps14_reg_ops = {
488 .min_uV = min, \ 488 .min_uV = min, \
489 .uV_step = step, \ 489 .uV_step = step, \
490 .n_voltages = S2MPS14_BUCK_N_VOLTAGES, \ 490 .n_voltages = S2MPS14_BUCK_N_VOLTAGES, \
491 .linear_min_sel = S2MPS14_BUCK1235_START_SEL, \ 491 .linear_min_sel = min_sel, \
492 .ramp_delay = S2MPS14_BUCK_RAMP_DELAY, \ 492 .ramp_delay = S2MPS14_BUCK_RAMP_DELAY, \
493 .vsel_reg = S2MPS14_REG_B1CTRL2 + (num - 1) * 2, \ 493 .vsel_reg = S2MPS14_REG_B1CTRL2 + (num - 1) * 2, \
494 .vsel_mask = S2MPS14_BUCK_VSEL_MASK, \ 494 .vsel_mask = S2MPS14_BUCK_VSEL_MASK, \
@@ -522,11 +522,16 @@ static const struct regulator_desc s2mps14_regulators[] = {
522 regulator_desc_s2mps14_ldo(23, MIN_800_MV, STEP_25_MV), 522 regulator_desc_s2mps14_ldo(23, MIN_800_MV, STEP_25_MV),
523 regulator_desc_s2mps14_ldo(24, MIN_1800_MV, STEP_25_MV), 523 regulator_desc_s2mps14_ldo(24, MIN_1800_MV, STEP_25_MV),
524 regulator_desc_s2mps14_ldo(25, MIN_1800_MV, STEP_25_MV), 524 regulator_desc_s2mps14_ldo(25, MIN_1800_MV, STEP_25_MV),
525 regulator_desc_s2mps14_buck(1, MIN_600_MV, STEP_6_25_MV), 525 regulator_desc_s2mps14_buck(1, MIN_600_MV, STEP_6_25_MV,
526 regulator_desc_s2mps14_buck(2, MIN_600_MV, STEP_6_25_MV), 526 S2MPS14_BUCK1235_START_SEL),
527 regulator_desc_s2mps14_buck(3, MIN_600_MV, STEP_6_25_MV), 527 regulator_desc_s2mps14_buck(2, MIN_600_MV, STEP_6_25_MV,
528 regulator_desc_s2mps14_buck(4, MIN_1400_MV, STEP_12_5_MV), 528 S2MPS14_BUCK1235_START_SEL),
529 regulator_desc_s2mps14_buck(5, MIN_600_MV, STEP_6_25_MV), 529 regulator_desc_s2mps14_buck(3, MIN_600_MV, STEP_6_25_MV,
530 S2MPS14_BUCK1235_START_SEL),
531 regulator_desc_s2mps14_buck(4, MIN_1400_MV, STEP_12_5_MV,
532 S2MPS14_BUCK4_START_SEL),
533 regulator_desc_s2mps14_buck(5, MIN_600_MV, STEP_6_25_MV,
534 S2MPS14_BUCK1235_START_SEL),
530}; 535};
531 536
532static int s2mps14_pmic_enable_ext_control(struct s2mps11_info *s2mps11, 537static int s2mps14_pmic_enable_ext_control(struct s2mps11_info *s2mps11,