| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20251103-s2mpg1x-regulators-v3-19-b8b96b79e058@linaro.org>
Date: Mon, 03 Nov 2025 19:14:58 +0000
From: André Draszik <andre.draszik@...aro.org>
To: Tudor Ambarus <tudor.ambarus@...aro.org>, Rob Herring <robh@...nel.org>,
Conor Dooley <conor+dt@...nel.org>, Krzysztof Kozlowski <krzk@...nel.org>,
Liam Girdwood <lgirdwood@...il.com>, Mark Brown <broonie@...nel.org>,
Lee Jones <lee@...nel.org>, Linus Walleij <linus.walleij@...aro.org>,
Bartosz Golaszewski <brgl@...ev.pl>,
Krzysztof Kozlowski <krzk+dt@...nel.org>
Cc: Peter Griffin <peter.griffin@...aro.org>,
Will McVicker <willmcvicker@...gle.com>, kernel-team@...roid.com,
linux-kernel@...r.kernel.org, linux-samsung-soc@...r.kernel.org,
devicetree@...r.kernel.org, linux-gpio@...r.kernel.org,
André Draszik <andre.draszik@...aro.org>
Subject: [PATCH v3 19/20] regulator: s2mps11: add S2MPG11 regulator
The S2MPG11 PMIC is a Power Management IC for mobile applications with
buck converters, various LDOs, power meters, and additional GPIO
interfaces. It typically complements an S2MPG10 PMIC in a main/sub
configuration as the sub-PMIC.
It has 12 buck, 1 buck-boost, and 15 LDO rails. Several of these can
either be controlled via software (register writes) or via external
signals, in particular by:
* input pins connected to a main processor's:
* GPIO pins
* other pins that are e.g. firmware- or power-domain-controlled
without explicit driver intervention
* a combination of input pins and register writes.
Control via input pins allows PMIC rails to be controlled by firmware,
e.g. during standby/suspend or as part of power domain handling where
otherwise that would not be possible. Additionally toggling a pin is
faster than register writes, and it also allows the PMIC to ensure that
any necessary timing requirements between rails are respected
automatically if multiple rails are to be enabled or disabled quasi
simultaneously.
This commit implements support for all these rails and control
combination.
Note1: For an externally controlled rail, the regulator_ops provide an
empty ::enable() and no ::disable() implementations, even though Linux
can not enable the rail and one might think ::enable could be NULL.
Without ops->enable(), the regulator core will assume enabling such a
rail failed, though, and in turn never add a reference to its parent
(supplier) rail. Once a different (Linux-controlled) sibling (consumer)
rail on that same parent rail gets disabled, the parent gets disabled
(cutting power to the externally controlled rail although it should
stay on), and the system will misbehave.
Note2: The rails are instantiated as separate driver instances for each
rail, because S2MPG11 is typically used with an S2MPG10 main-PMIC where
some bucks of one typically supply at least some of the LDOs of the
other. Using separate instances avoids issues around circular
dependencies which occur otherwise.
Note3: While external control via input pins appears to exist on other
versions of this PMIC, there is more flexibility in this version, in
particular there is a selection of input pins to choose from for each
rail (which must therefore be configured accordingly if in use),
whereas other versions don't have this flexibility.
Signed-off-by: André Draszik <andre.draszik@...aro.org>
---
v3:
- one instance per actual rail, not per rail type (LDO or buck)
- assign correct ::ops for LDOs with ramp support
- sort s2mpg11 bucks before LDOs throughout (alphabetic ordering)
- add ::enable() to ops for signal-controlled rails and update commit
message detailing why
- more details around signal controlled rails in commit message
v2:
- fix commit message typo
- mention GPIOs in commit message
---
drivers/regulator/s2mps11.c | 307 +++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 306 insertions(+), 1 deletion(-)
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index 35cfea6b6d8091ba21f00e1cb82b11a8dc9bc3ec..f19140e97b9d7a5e7c07cdc5e002de345aad32d9 100644
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -19,6 +19,7 @@
#include <linux/mfd/core.h>
#include <linux/mfd/samsung/core.h>
#include <linux/mfd/samsung/s2mpg10.h>
+#include <linux/mfd/samsung/s2mpg11.h>
#include <linux/mfd/samsung/s2mps11.h>
#include <linux/mfd/samsung/s2mps13.h>
#include <linux/mfd/samsung/s2mps14.h>
@@ -432,9 +433,20 @@ static int s2mpg10_of_parse_cb(struct device_node *np,
[S2MPG10_EXTCTRL_LDO20M_EN2] = S2MPG10_PCTRLSEL_LDO20M_EN2,
[S2MPG10_EXTCTRL_LDO20M_EN] = S2MPG10_PCTRLSEL_LDO20M_EN,
};
+ static const u32 ext_control_s2mpg11[] = {
+ [S2MPG11_EXTCTRL_PWREN] = S2MPG10_PCTRLSEL_PWREN,
+ [S2MPG11_EXTCTRL_PWREN_MIF] = S2MPG10_PCTRLSEL_PWREN_MIF,
+ [S2MPG11_EXTCTRL_AP_ACTIVE_N] = S2MPG10_PCTRLSEL_AP_ACTIVE_N,
+ [S2MPG11_EXTCTRL_G3D_EN] = S2MPG10_PCTRLSEL_CPUCL1_EN,
+ [S2MPG11_EXTCTRL_G3D_EN2] = S2MPG10_PCTRLSEL_CPUCL1_EN2,
+ [S2MPG11_EXTCTRL_AOC_VDD] = S2MPG10_PCTRLSEL_CPUCL2_EN,
+ [S2MPG11_EXTCTRL_AOC_RET] = S2MPG10_PCTRLSEL_CPUCL2_EN2,
+ [S2MPG11_EXTCTRL_UFS_EN] = S2MPG10_PCTRLSEL_TPU_EN,
+ [S2MPG11_EXTCTRL_LDO13S_EN] = S2MPG10_PCTRLSEL_TPU_EN2,
+ };
u32 ext_control;
- if (s2mps11->dev_type != S2MPG10)
+ if (s2mps11->dev_type != S2MPG10 && s2mps11->dev_type != S2MPG11)
return 0;
if (of_property_read_u32(np, "samsung,ext-control", &ext_control))
@@ -465,6 +477,31 @@ static int s2mpg10_of_parse_cb(struct device_node *np,
ext_control = ext_control_s2mpg10[ext_control];
break;
+ case S2MPG11:
+ switch (desc->id) {
+ case S2MPG11_BUCK1 ... S2MPG11_BUCK3:
+ case S2MPG11_BUCK5:
+ case S2MPG11_BUCK8:
+ case S2MPG11_BUCK9:
+ case S2MPG11_BUCKD:
+ case S2MPG11_BUCKA:
+ case S2MPG10_LDO1:
+ case S2MPG10_LDO2:
+ case S2MPG10_LDO8:
+ case S2MPG10_LDO13:
+ if (ext_control > S2MPG11_EXTCTRL_LDO13S_EN)
+ return -EINVAL;
+ break;
+
+ default:
+ return -EINVAL;
+ }
+
+ if (ext_control > ARRAY_SIZE(ext_control_s2mpg11))
+ return -EINVAL;
+ ext_control = ext_control_s2mpg11[ext_control];
+ break;
+
default:
return -EINVAL;
}
@@ -502,6 +539,7 @@ static int s2mpg10_enable_ext_control(struct s2mps11_info *s2mps11,
switch (s2mps11->dev_type) {
case S2MPG10:
+ case S2MPG11:
s2mpg10_desc = to_s2mpg10_regulator_desc(rdev->desc);
break;
@@ -602,6 +640,21 @@ static int s2mpg10_regulator_buck_set_voltage_time(struct regulator_dev *rdev,
rdev->desc->ramp_mask);
}
+static int s2mpg11_regulator_buck_set_voltage_time(struct regulator_dev *rdev,
+ int old_uV, int new_uV)
+{
+ unsigned int ramp_mask;
+
+ ramp_mask = rdev->desc->ramp_mask;
+ if (old_uV > new_uV)
+ /* The downwards mask is at a different position. */
+ ramp_mask >>= 2;
+
+ return s2mpg1x_regulator_buck_set_voltage_time(rdev, old_uV, new_uV,
+ rdev->desc->ramp_reg,
+ ramp_mask);
+}
+
/*
* We assign both, ::set_voltage_time() and ::set_voltage_time_sel(), because
* only if the latter is != NULL, the regulator core will call neither during
@@ -962,6 +1015,246 @@ static const struct s2mpg10_regulator_desc s2mpg10_regulators[] = {
s2mpg10_regulator_desc_ldo(31, "vinl11m", s2mpg10_ldo_vranges2)
};
+static const struct regulator_ops s2mpg11_reg_buck_ops[] = {
+ [S2MPG10_REGULATOR_OPS_STD] = {
+ .list_voltage = regulator_list_voltage_linear_range,
+ .map_voltage = regulator_map_voltage_linear_range,
+ .is_enabled = regulator_is_enabled_regmap,
+ .enable = regulator_enable_regmap,
+ .disable = regulator_disable_regmap,
+ .get_voltage_sel = regulator_get_voltage_sel_regmap,
+ .set_voltage_sel = regulator_set_voltage_sel_regmap,
+ .set_voltage_time = s2mpg11_regulator_buck_set_voltage_time,
+ .set_voltage_time_sel = regulator_set_voltage_time_sel,
+ .enable_time = s2mpg10_regulator_buck_enable_time,
+ .set_ramp_delay = regulator_set_ramp_delay_regmap,
+ },
+ [S2MPG10_REGULATOR_OPS_EXTCONTROL] = {
+ .list_voltage = regulator_list_voltage_linear_range,
+ .map_voltage = regulator_map_voltage_linear_range,
+ .enable = s2mpg10_regulator_enable_nop,
+ .get_voltage_sel = regulator_get_voltage_sel_regmap,
+ .set_voltage_sel = regulator_set_voltage_sel_regmap,
+ .set_voltage_time = s2mpg11_regulator_buck_set_voltage_time,
+ .set_voltage_time_sel = regulator_set_voltage_time_sel,
+ .enable_time = s2mpg10_regulator_buck_enable_time,
+ .set_ramp_delay = regulator_set_ramp_delay_regmap,
+ }
+};
+
+#define s2mpg11_buck_to_ramp_mask(n) (GENMASK(3, 2) << (((n) % 2) * 4))
+
+#define regulator_desc_s2mpg11_buckx(_name, _id, _supply, _vrange, \
+ _vsel_reg, _en_reg, _en_mask, _r_reg) \
+ regulator_desc_s2mpg1x_buck_cmn(_name, _id, _supply, \
+ s2mpg11_reg_buck_ops, _vrange, \
+ S2MPG11_PMIC_##_vsel_reg, GENMASK(7, 0), \
+ S2MPG11_PMIC_##_en_reg, _en_mask, \
+ S2MPG11_PMIC_##_r_reg, \
+ s2mpg11_buck_to_ramp_mask(_id - S2MPG11_BUCK1), \
+ s2mpg10_buck_ramp_table, \
+ ARRAY_SIZE(s2mpg10_buck_ramp_table), 30)
+
+#define s2mpg11_regulator_desc_buck_xm(_num, _vrange, _vsel_reg_sfx, \
+ _en_mask, _r_reg, _en_rrate) \
+ .desc = regulator_desc_s2mpg11_buckx(#_num"s", \
+ S2MPG11_BUCK##_num, "vinb"#_num"s", \
+ _vrange, \
+ B##_num##S_##_vsel_reg_sfx, \
+ B##_num##S_CTRL, _en_mask, \
+ _r_reg), \
+ .enable_ramp_rate = _en_rrate
+
+#define s2mpg11_regulator_desc_buck_cm(_num, _vrange, _vsel_reg_sfx, \
+ _en_mask, _r_reg) \
+ [S2MPG11_BUCK##_num] = { \
+ s2mpg11_regulator_desc_buck_xm(_num, _vrange, \
+ _vsel_reg_sfx, _en_mask, _r_reg, 12500), \
+ }
+
+#define s2mpg11_regulator_desc_buckn_cm_gpio(_num, _vrange, \
+ _vsel_reg_sfx, _en_mask, _r_reg, _pc_reg, _pc_mask) \
+ [S2MPG11_BUCK##_num] = { \
+ s2mpg11_regulator_desc_buck_xm(_num, _vrange, \
+ _vsel_reg_sfx, _en_mask, _r_reg, 12500), \
+ .pctrlsel_reg = S2MPG11_PMIC_##_pc_reg, \
+ .pctrlsel_mask = _pc_mask, \
+ }
+
+#define s2mpg11_regulator_desc_buck_vm(_num, _vrange, _vsel_reg_sfx, \
+ _en_mask, _r_reg) \
+ [S2MPG11_BUCK##_num] = { \
+ s2mpg11_regulator_desc_buck_xm(_num, _vrange, \
+ _vsel_reg_sfx, _en_mask, _r_reg, 25000), \
+ }
+
+#define s2mpg11_regulator_desc_bucka(_num, _num_lower, _r_reg, \
+ _pc_reg, _pc_mask) \
+ [S2MPG11_BUCK##_num] = { \
+ .desc = regulator_desc_s2mpg11_buckx(#_num_lower, \
+ S2MPG11_BUCK##_num, "vinb"#_num_lower, \
+ s2mpg11_buck_vranges##_num_lower, \
+ BUCK##_num##_OUT, \
+ BUCK##_num##_CTRL, GENMASK(7, 6), \
+ _r_reg), \
+ .enable_ramp_rate = 25000, \
+ .pctrlsel_reg = S2MPG11_PMIC_##_pc_reg, \
+ .pctrlsel_mask = _pc_mask, \
+ }
+
+#define s2mpg11_regulator_desc_buckboost() \
+ [S2MPG11_BUCKBOOST] = { \
+ .desc = regulator_desc_s2mpg1x_buck_cmn("boost", \
+ S2MPG11_BUCKBOOST, "vinbb", \
+ s2mpg10_reg_ldo_ops, \
+ s2mpg11_buck_vrangesboost, \
+ S2MPG11_PMIC_BB_OUT1, GENMASK(6, 0), \
+ S2MPG11_PMIC_BB_CTRL, BIT(7), \
+ 0, 0, NULL, 0, 35), \
+ .enable_ramp_rate = 17500, \
+ }
+
+#define s2mpg11_regulator_desc_ldo_cmn(_num, _supply, _ops, \
+ _vrange, _vsel_reg_sfx, _vsel_mask, _en_reg, _en_mask, \
+ _ramp_delay, _r_reg, _r_mask, _r_table, _r_table_sz, \
+ _pc_reg, _pc_mask) \
+ [S2MPG11_LDO##_num] = { \
+ .desc = regulator_desc_s2mpg1x_ldo_cmn(#_num "s", \
+ S2MPG11_LDO##_num, _supply, _ops, \
+ _vrange, \
+ S2MPG11_PMIC_L##_num##S_##_vsel_reg_sfx, \
+ _vsel_mask, \
+ S2MPG11_PMIC_##_en_reg, _en_mask, \
+ _ramp_delay, _r_reg, _r_mask, _r_table, \
+ _r_table_sz), \
+ .pctrlsel_reg = _pc_reg, \
+ .pctrlsel_mask = _pc_mask, \
+ }
+
+/* standard LDO via LxM_CTRL */
+#define s2mpg11_regulator_desc_ldo(_num, _supply, _vrange) \
+ s2mpg11_regulator_desc_ldo_cmn(_num, _supply, \
+ s2mpg10_reg_ldo_ops, _vrange, CTRL, GENMASK(5, 0), \
+ L##_num##S_CTRL, BIT(7), \
+ 0, 0, 0, NULL, 0, \
+ 0, 0)
+
+/* standard LDO but possibly GPIO controlled */
+#define s2mpg11_regulator_desc_ldo_gpio(_num, _supply, _vrange, \
+ _pc_reg, _pc_mask) \
+ s2mpg11_regulator_desc_ldo_cmn(_num, _supply, \
+ s2mpg10_reg_ldo_ops, _vrange, CTRL, GENMASK(5, 0), \
+ L##_num##S_CTRL, GENMASK(7, 6), \
+ 0, 0, 0, NULL, 0, \
+ S2MPG11_PMIC_##_pc_reg, _pc_mask)
+
+/* LDO with ramp support and possibly GPIO controlled */
+#define s2mpg11_regulator_desc_ldo_ramp(_num, _supply, _vrange, \
+ _en_mask, _r_reg, _pc_reg, _pc_mask) \
+ s2mpg11_regulator_desc_ldo_cmn(_num, _supply, \
+ s2mpg10_reg_ldo_ramp_ops, _vrange, CTRL1, GENMASK(6, 0), \
+ LDO_CTRL1, _en_mask, \
+ 6250, S2MPG11_PMIC_##_r_reg, GENMASK(1, 0), \
+ s2mpg10_ldo_ramp_table, \
+ ARRAY_SIZE(s2mpg10_ldo_ramp_table), \
+ S2MPG11_PMIC_##_pc_reg, _pc_mask)
+
+/* voltage range for s2mpg11 BUCK 1, 2, 3, 4, 8, 9, 10 */
+S2MPG10_VOLTAGE_RANGE(s2mpg11_buck, 1, 200000, 450000, 1300000, STEP_6_25_MV);
+
+/* voltage range for s2mpg11 BUCK 5 */
+S2MPG10_VOLTAGE_RANGE(s2mpg11_buck, 5, 200000, 400000, 1300000, STEP_6_25_MV);
+
+/* voltage range for s2mpg11 BUCK 6 */
+S2MPG10_VOLTAGE_RANGE(s2mpg11_buck, 6, 200000, 1000000, 1500000, STEP_6_25_MV);
+
+/* voltage range for s2mpg11 BUCK 7 */
+S2MPG10_VOLTAGE_RANGE(s2mpg11_buck, 7, 600000, 1500000, 2200000, STEP_12_5_MV);
+
+/* voltage range for s2mpg11 BUCK D */
+S2MPG10_VOLTAGE_RANGE(s2mpg11_buck, d, 600000, 2400000, 3300000, STEP_12_5_MV);
+
+/* voltage range for s2mpg11 BUCK A */
+S2MPG10_VOLTAGE_RANGE(s2mpg11_buck, a, 600000, 1700000, 2100000, STEP_12_5_MV);
+
+/* voltage range for s2mpg11 BUCK BOOST */
+S2MPG10_VOLTAGE_RANGE(s2mpg11_buck, boost,
+ 2600000, 3000000, 3600000, STEP_12_5_MV);
+
+/* voltage range for s2mpg11 LDO 1, 2 */
+S2MPG10_VOLTAGE_RANGE(s2mpg11_ldo, 1, 300000, 450000, 950000, STEP_12_5_MV);
+
+/* voltage range for s2mpg11 LDO 3, 7, 10, 11, 12, 14, 15 */
+S2MPG10_VOLTAGE_RANGE(s2mpg11_ldo, 3, 700000, 1600000, 1950000, STEP_25_MV);
+
+/* voltage range for s2mpg11 LDO 4, 6 */
+S2MPG10_VOLTAGE_RANGE(s2mpg11_ldo, 4, 1800000, 2500000, 3300000, STEP_25_MV);
+
+/* voltage range for s2mpg11 LDO 5 */
+S2MPG10_VOLTAGE_RANGE(s2mpg11_ldo, 5, 1600000, 1600000, 1950000, STEP_12_5_MV);
+
+/* voltage range for s2mpg11 LDO 8 */
+S2MPG10_VOLTAGE_RANGE(s2mpg11_ldo, 8, 979600, 1130400, 1281200, 5800);
+
+/* voltage range for s2mpg11 LDO 9 */
+S2MPG10_VOLTAGE_RANGE(s2mpg11_ldo, 9, 725000, 725000, 1300000, STEP_12_5_MV);
+
+/* voltage range for s2mpg11 LDO 13 */
+S2MPG10_VOLTAGE_RANGE(s2mpg11_ldo, 13, 1800000, 1800000, 3350000, STEP_25_MV);
+
+static const struct s2mpg10_regulator_desc s2mpg11_regulators[] = {
+ s2mpg11_regulator_desc_buckboost(),
+ s2mpg11_regulator_desc_buckn_cm_gpio(1, s2mpg11_buck_vranges1,
+ OUT1, GENMASK(7, 6), DVS_RAMP1,
+ PCTRLSEL1, GENMASK(3, 0)),
+ s2mpg11_regulator_desc_buckn_cm_gpio(2, s2mpg11_buck_vranges1,
+ OUT1, GENMASK(7, 6), DVS_RAMP1,
+ PCTRLSEL1, GENMASK(7, 4)),
+ s2mpg11_regulator_desc_buckn_cm_gpio(3, s2mpg11_buck_vranges1,
+ OUT1, GENMASK(7, 6), DVS_RAMP2,
+ PCTRLSEL2, GENMASK(3, 0)),
+ s2mpg11_regulator_desc_buck_cm(4, s2mpg11_buck_vranges1,
+ OUT, BIT(7), DVS_RAMP2),
+ s2mpg11_regulator_desc_buckn_cm_gpio(5, s2mpg11_buck_vranges5,
+ OUT, GENMASK(7, 6), DVS_RAMP3,
+ PCTRLSEL2, GENMASK(7, 4)),
+ s2mpg11_regulator_desc_buck_cm(6, s2mpg11_buck_vranges6,
+ OUT1, BIT(7), DVS_RAMP3),
+ s2mpg11_regulator_desc_buck_vm(7, s2mpg11_buck_vranges7,
+ OUT1, BIT(7), DVS_RAMP4),
+ s2mpg11_regulator_desc_buckn_cm_gpio(8, s2mpg11_buck_vranges1,
+ OUT1, GENMASK(7, 6), DVS_RAMP4,
+ PCTRLSEL3, GENMASK(3, 0)),
+ s2mpg11_regulator_desc_buckn_cm_gpio(9, s2mpg11_buck_vranges1,
+ OUT1, GENMASK(7, 6), DVS_RAMP5,
+ PCTRLSEL3, GENMASK(7, 4)),
+ s2mpg11_regulator_desc_buck_cm(10, s2mpg11_buck_vranges1,
+ OUT, BIT(7), DVS_RAMP5),
+ s2mpg11_regulator_desc_bucka(D, d, DVS_RAMP6, PCTRLSEL4, GENMASK(3, 0)),
+ s2mpg11_regulator_desc_bucka(A, a, DVS_RAMP6, PCTRLSEL4, GENMASK(7, 4)),
+ s2mpg11_regulator_desc_ldo_ramp(1, "vinl1s", s2mpg11_ldo_vranges1,
+ GENMASK(5, 4), DVS_SYNC_CTRL1,
+ PCTRLSEL5, GENMASK(3, 0)),
+ s2mpg11_regulator_desc_ldo_ramp(2, "vinl1s", s2mpg11_ldo_vranges1,
+ GENMASK(7, 6), DVS_SYNC_CTRL2,
+ PCTRLSEL5, GENMASK(7, 4)),
+ s2mpg11_regulator_desc_ldo(3, "vinl3s", s2mpg11_ldo_vranges3),
+ s2mpg11_regulator_desc_ldo(4, "vinl5s", s2mpg11_ldo_vranges4),
+ s2mpg11_regulator_desc_ldo(5, "vinl3s", s2mpg11_ldo_vranges5),
+ s2mpg11_regulator_desc_ldo(6, "vinl5s", s2mpg11_ldo_vranges4),
+ s2mpg11_regulator_desc_ldo(7, "vinl3s", s2mpg11_ldo_vranges3),
+ s2mpg11_regulator_desc_ldo_gpio(8, "vinl2s", s2mpg11_ldo_vranges8,
+ PCTRLSEL6, GENMASK(3, 0)),
+ s2mpg11_regulator_desc_ldo(9, "vinl2s", s2mpg11_ldo_vranges9),
+ s2mpg11_regulator_desc_ldo(10, "vinl4s", s2mpg11_ldo_vranges3),
+ s2mpg11_regulator_desc_ldo(11, "vinl4s", s2mpg11_ldo_vranges3),
+ s2mpg11_regulator_desc_ldo(12, "vinl4s", s2mpg11_ldo_vranges3),
+ s2mpg11_regulator_desc_ldo_gpio(13, "vinl6s", s2mpg11_ldo_vranges13,
+ PCTRLSEL6, GENMASK(7, 4)),
+ s2mpg11_regulator_desc_ldo(14, "vinl4s", s2mpg11_ldo_vranges3),
+ s2mpg11_regulator_desc_ldo(15, "vinl3s", s2mpg11_ldo_vranges3)
+};
+
static const struct regulator_ops s2mps11_ldo_ops = {
.list_voltage = regulator_list_voltage_linear,
.map_voltage = regulator_map_voltage_linear,
@@ -1846,6 +2139,7 @@ static int s2mps11_handle_ext_control(struct s2mps11_info *s2mps11,
break;
case S2MPG10:
+ case S2MPG11:
/*
* If desc.enable_val is != 0, then external control was
* requested. We can not test s2mpg10_desc::ext_control,
@@ -1892,6 +2186,16 @@ static int s2mps11_pmic_probe(struct platform_device *pdev)
s2mpg1x_regulators = &s2mpg10_regulators[cell->id];
BUILD_BUG_ON(ARRAY_SIZE(s2mpg10_regulators) > S2MPS_REGULATOR_MAX);
break;
+ case S2MPG11:
+ if (cell->id >= ARRAY_SIZE(s2mpg11_regulators))
+ return dev_err_probe(&pdev->dev, -ENODEV,
+ "Unsupported regulator ID %d\n",
+ cell->id);
+
+ rdev_num = 1;
+ s2mpg1x_regulators = &s2mpg11_regulators[cell->id];
+ BUILD_BUG_ON(ARRAY_SIZE(s2mpg11_regulators) > S2MPS_REGULATOR_MAX);
+ break;
case S2MPS11X:
rdev_num = ARRAY_SIZE(s2mps11_regulators);
regulators = s2mps11_regulators;
@@ -1971,6 +2275,7 @@ static int s2mps11_pmic_probe(struct platform_device *pdev)
static const struct platform_device_id s2mps11_pmic_id[] = {
{ "s2mpg10-regulator", S2MPG10},
+ { "s2mpg11-regulator", S2MPG11},
{ "s2mps11-regulator", S2MPS11X},
{ "s2mps13-regulator", S2MPS13X},
{ "s2mps14-regulator", S2MPS14X},
--
2.51.2.997.g839fc31de9-goog
Powered by blists - more mailing lists