Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+6
-10
+6
-10
drivers/regulator/da9121-regulator.c
+6
-10
drivers/regulator/da9121-regulator.c
···
87
87
};
88
88
89
89
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,
93
93
.reg_min = 1,
94
94
.reg_max = 14,
95
95
};
96
96
97
97
static struct da9121_range da914x_20A_2phase_current = {
98
-
.val_min = 7000000,
99
-
.val_max = 40000000,
98
+
.val_min = 13000000,
99
+
.val_max = 39000000,
100
100
.val_stp = 2000000,
101
101
.reg_min = 1,
102
102
.reg_max = 14,
···
561
561
};
562
562
563
563
#define DA914X_MIN_MV 500
564
-
#define DA914X_MAX_MV 1000
564
+
#define DA914X_MAX_MV 1300
565
565
#define DA914X_STEP_MV 10
566
566
#define DA914X_MIN_SEL (DA914X_MIN_MV / DA914X_STEP_MV)
567
567
#define DA914X_N_VOLTAGES (((DA914X_MAX_MV - DA914X_MIN_MV) / DA914X_STEP_MV) \
···
585
585
.vsel_mask = DA9121_MASK_BUCK_BUCKx_5_CHx_A_VOUT,
586
586
.enable_reg = DA9121_REG_BUCK_BUCK1_0,
587
587
.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,
592
588
};
593
589
594
590
static const struct regulator_desc da9142_reg = {