Skip to content

Commit 64b5132

Browse files
committed
Merge tag 'regulator-fix-v5.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown: "A series of fixes for the da9121 driver" * tag 'regulator-fix-v5.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: regulator: da9121: Remove surplus DA9141 parameters regulator: da9121: Fix DA914x voltage value regulator: da9121: Fix DA914x current values
2 parents 0e9894e + 9c7cf33 commit 64b5132

1 file changed

Lines changed: 6 additions & 10 deletions

File tree

drivers/regulator/da9121-regulator.c

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,16 @@ static struct da9121_range da9121_3A_1phase_current = {
8787
};
8888

8989
static struct da9121_range da914x_40A_4phase_current = {
90-
.val_min = 14000000,
91-
.val_max = 80000000,
92-
.val_stp = 2000000,
90+
.val_min = 26000000,
91+
.val_max = 78000000,
92+
.val_stp = 4000000,
9393
.reg_min = 1,
9494
.reg_max = 14,
9595
};
9696

9797
static struct da9121_range da914x_20A_2phase_current = {
98-
.val_min = 7000000,
99-
.val_max = 40000000,
98+
.val_min = 13000000,
99+
.val_max = 39000000,
100100
.val_stp = 2000000,
101101
.reg_min = 1,
102102
.reg_max = 14,
@@ -561,7 +561,7 @@ static const struct regulator_desc da9217_reg = {
561561
};
562562

563563
#define DA914X_MIN_MV 500
564-
#define DA914X_MAX_MV 1000
564+
#define DA914X_MAX_MV 1300
565565
#define DA914X_STEP_MV 10
566566
#define DA914X_MIN_SEL (DA914X_MIN_MV / DA914X_STEP_MV)
567567
#define DA914X_N_VOLTAGES (((DA914X_MAX_MV - DA914X_MIN_MV) / DA914X_STEP_MV) \
@@ -585,10 +585,6 @@ static const struct regulator_desc da9141_reg = {
585585
.vsel_mask = DA9121_MASK_BUCK_BUCKx_5_CHx_A_VOUT,
586586
.enable_reg = DA9121_REG_BUCK_BUCK1_0,
587587
.enable_mask = DA9121_MASK_BUCK_BUCKx_0_CHx_EN,
588-
/* Default value of BUCK_BUCK1_0.CH1_SRC_DVC_UP */
589-
.ramp_delay = 20000,
590-
/* tBUCK_EN */
591-
.enable_time = 20,
592588
};
593589

594590
static const struct regulator_desc da9142_reg = {

0 commit comments

Comments
 (0)