| Message ID | 1392123837-5517-12-git-send-email-k.kozlowski@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
> S2MPS11/S2MPS14 regulators support different modes of operation: > - Always off; > - On/Off controlled by pin/GPIO (PWREN/LDOEN/EMMCEN); > - Always on; > This is very similar to S5M8767 regulator driver which also supports > opmodes (although S5M8767 have also low-power mode). > > This patch adds parsing the operation mode from DTS by reading a > "op_mode" property from regulator child node. > > The op_mode is then used for enabling the S2MPS14 regulators. > On S2MPS11 the DTS "op_mode" property is parsed but not used for > enabling, as this was not tested. > > Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> > Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> > Cc: Mark Brown <broonie@kernel.org> > Cc: Liam Girdwood <lgirdwood@gmail.com> > --- > drivers/regulator/s2mps11.c | 98 ++++++++++++++++++++++++++++++++++- > include/linux/mfd/samsung/s2mps14.h | 17 ++++++ > 2 files changed, 114 insertions(+), 1 deletion(-) <snip> > diff --git a/include/linux/mfd/samsung/s2mps14.h b/include/linux/mfd/samsung/s2mps14.h > index c4bfb8edc836..69582ae4c971 100644 > --- a/include/linux/mfd/samsung/s2mps14.h > +++ b/include/linux/mfd/samsung/s2mps14.h > @@ -149,4 +149,21 @@ enum s2mps14_regulators { > #define S2MPS14_LDO_N_VOLTAGES (S2MPS14_LDO_VSEL_MASK + 1) > #define S2MPS14_BUCK_N_VOLTAGES (S2MPS14_BUCK_VSEL_MASK + 1) > > +#define S2MPS14_ENCTRL_SHIFT 6 > +#define S2MPS14_ENCTRL_MASK (0x3 << S2MPS14_ENCTRL_SHIFT) > + > +/* > + * Values of regulator operation modes match device tree bindings. > + */ > +enum s2mps14_regulator_opmode { > + S2MPS14_REGULATOR_OPMODE_OFF = 0, > + S2MPS14_REGULATOR_OPMODE_ON = 1, > + /* Reserved for compatibility with S5M8767 where this > + * is a low power mode. */ Sorry to be an arse, but can you use proper multi-line comments please? The preferred style for long (multi-line) comments is: /* * This is the preferred style for multi-line * comments in the Linux kernel source code. * Please use it consistently. * * Description: A column of asterisks on the left side, * with beginning and ending almost-blank lines. */
On Wed, 2014-02-12 at 09:21 +0000, Lee Jones wrote: > > S2MPS11/S2MPS14 regulators support different modes of operation: > > - Always off; > > - On/Off controlled by pin/GPIO (PWREN/LDOEN/EMMCEN); > > - Always on; > > This is very similar to S5M8767 regulator driver which also supports > > opmodes (although S5M8767 have also low-power mode). > > > > This patch adds parsing the operation mode from DTS by reading a > > "op_mode" property from regulator child node. > > > > The op_mode is then used for enabling the S2MPS14 regulators. > > On S2MPS11 the DTS "op_mode" property is parsed but not used for > > enabling, as this was not tested. > > > > Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> > > Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> > > Cc: Mark Brown <broonie@kernel.org> > > Cc: Liam Girdwood <lgirdwood@gmail.com> > > --- > > drivers/regulator/s2mps11.c | 98 ++++++++++++++++++++++++++++++++++- > > include/linux/mfd/samsung/s2mps14.h | 17 ++++++ > > 2 files changed, 114 insertions(+), 1 deletion(-) > > <snip> > > > diff --git a/include/linux/mfd/samsung/s2mps14.h b/include/linux/mfd/samsung/s2mps14.h > > index c4bfb8edc836..69582ae4c971 100644 > > --- a/include/linux/mfd/samsung/s2mps14.h > > +++ b/include/linux/mfd/samsung/s2mps14.h > > @@ -149,4 +149,21 @@ enum s2mps14_regulators { > > #define S2MPS14_LDO_N_VOLTAGES (S2MPS14_LDO_VSEL_MASK + 1) > > #define S2MPS14_BUCK_N_VOLTAGES (S2MPS14_BUCK_VSEL_MASK + 1) > > > > +#define S2MPS14_ENCTRL_SHIFT 6 > > +#define S2MPS14_ENCTRL_MASK (0x3 << S2MPS14_ENCTRL_SHIFT) > > + > > +/* > > + * Values of regulator operation modes match device tree bindings. > > + */ > > +enum s2mps14_regulator_opmode { > > + S2MPS14_REGULATOR_OPMODE_OFF = 0, > > + S2MPS14_REGULATOR_OPMODE_ON = 1, > > + /* Reserved for compatibility with S5M8767 where this > > + * is a low power mode. */ > > Sorry to be an arse, but can you use proper multi-line comments > please? > > The preferred style for long (multi-line) comments is: > > /* > * This is the preferred style for multi-line > * comments in the Linux kernel source code. > * Please use it consistently. > * > * Description: A column of asterisks on the left side, > * with beginning and ending almost-blank lines. > */ No problem, I'll fix it. The preferred comment in such case had 4 lines instead of 2 so it looked a little weird to me :). -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c index c37869fb6c7a..b30fa6cd370d 100644 --- a/drivers/regulator/s2mps11.c +++ b/drivers/regulator/s2mps11.c @@ -34,6 +34,7 @@ struct s2mps11_info { struct regulator_dev **rdev; unsigned int rdev_num; + struct sec_opmode_data *opmode; int ramp_delay2; int ramp_delay34; @@ -43,6 +44,48 @@ struct s2mps11_info { int ramp_delay9; }; +/* LDO_EN/BUCK_EN register values for enabling/disabling regulator */ +static unsigned int s2mps14_opmode_reg[4] = { + [S2MPS14_REGULATOR_OPMODE_OFF] = 0x0, + [S2MPS14_REGULATOR_OPMODE_ON] = 0x3, + [S2MPS14_REGULATOR_OPMODE_RESERVED] = 0x2, + [S2MPS14_REGULATOR_OPMODE_SUSPEND] = 0x1, +}; + +static int s2mps14_get_opmode(struct regulator_dev *rdev) +{ + int i, reg_id = rdev_get_id(rdev); + int mode = -EINVAL; + struct s2mps11_info *s2mps11 = rdev_get_drvdata(rdev); + + for (i = 0; i < s2mps11->rdev_num; i++) { + if (s2mps11->opmode[i].id == reg_id) { + mode = s2mps11->opmode[i].mode; + break; + } + } + + if (mode == -EINVAL) { + dev_warn(rdev_get_dev(rdev), + "No op_mode in the driver for regulator %s\n", + rdev->desc->name); + return mode; + } + + return s2mps14_opmode_reg[mode] << S2MPS14_ENCTRL_SHIFT; +} + +static int s2mps14_reg_enable(struct regulator_dev *rdev) +{ + int enable_ctrl = s2mps14_get_opmode(rdev); + + if (enable_ctrl < 0) + return enable_ctrl; + + return regmap_update_bits(rdev->regmap, rdev->desc->enable_reg, + S2MPS14_ENCTRL_MASK, enable_ctrl); +} + static int get_ramp_delay(int ramp_delay) { unsigned char cnt = 0; @@ -405,7 +448,7 @@ static struct regulator_ops s2mps14_reg_ops = { .list_voltage = regulator_list_voltage_linear, .map_voltage = regulator_map_voltage_linear, .is_enabled = regulator_is_enabled_regmap, - .enable = regulator_enable_regmap, + .enable = s2mps14_reg_enable, .disable = regulator_disable_regmap, .get_voltage_sel = regulator_get_voltage_sel_regmap, .set_voltage_sel = regulator_set_voltage_sel_regmap, @@ -519,6 +562,54 @@ static const struct regulator_desc s2mps14_regulators[] = { regulator_desc_s2mps14_buck1235(5), }; +static inline void s2mps11_dt_read_opmode(struct platform_device *pdev, + struct device_node *np, unsigned int *mode) +{ + if (of_property_read_u32(np, "op_mode", mode)) { + dev_warn(&pdev->dev, "no op_mode property property at %s\n", + np->full_name); + *mode = S2MPS14_REGULATOR_OPMODE_ON; + } else if (*mode >= S2MPS14_REGULATOR_OPMODE_MAX || + *mode == S2MPS14_REGULATOR_OPMODE_RESERVED) { + dev_warn(&pdev->dev, "wrong op_mode value at %s\n", + np->full_name); + *mode = S2MPS14_REGULATOR_OPMODE_ON; + } + /* else: 'mode' was read from DTS and it is valid */ +} + +/* + * Returns allocated array with opmodes for regulators. The opmodes are read + * from DTS. + */ +static struct sec_opmode_data * +s2mps11_pmic_dt_parse_opmode(struct platform_device *pdev, + struct s2mps11_info *s2mps11, struct of_regulator_match *rdata, + const struct regulator_desc *regulators) +{ + struct sec_opmode_data *rmode; + int i; + + rmode = devm_kzalloc(&pdev->dev, sizeof(*rmode) * s2mps11->rdev_num, + GFP_KERNEL); + if (!rmode) { + dev_err(&pdev->dev, + "could not allocate memory for regulator mode\n"); + return NULL; + } + + for (i = 0; i < s2mps11->rdev_num; i++) { + /* + * The index of rdata and regulators is the same, but this + * may not be equal to ID of regulator. + */ + rmode[i].id = regulators[i].id; + s2mps11_dt_read_opmode(pdev, rdata[i].of_node, &rmode[i].mode); + } + + return rmode; +} + static int s2mps11_pmic_probe(struct platform_device *pdev) { struct sec_pmic_dev *iodev = dev_get_drvdata(pdev->dev.parent); @@ -581,9 +672,14 @@ static int s2mps11_pmic_probe(struct platform_device *pdev) } of_regulator_match(&pdev->dev, reg_np, rdata, s2mps11->rdev_num); + pdata->opmode = s2mps11_pmic_dt_parse_opmode(pdev, s2mps11, rdata, + regulators); + if (!pdata->opmode) + return -ENOMEM; common_reg: platform_set_drvdata(pdev, s2mps11); + s2mps11->opmode = pdata->opmode; config.dev = &pdev->dev; config.regmap = iodev->regmap_pmic; diff --git a/include/linux/mfd/samsung/s2mps14.h b/include/linux/mfd/samsung/s2mps14.h index c4bfb8edc836..69582ae4c971 100644 --- a/include/linux/mfd/samsung/s2mps14.h +++ b/include/linux/mfd/samsung/s2mps14.h @@ -149,4 +149,21 @@ enum s2mps14_regulators { #define S2MPS14_LDO_N_VOLTAGES (S2MPS14_LDO_VSEL_MASK + 1) #define S2MPS14_BUCK_N_VOLTAGES (S2MPS14_BUCK_VSEL_MASK + 1) +#define S2MPS14_ENCTRL_SHIFT 6 +#define S2MPS14_ENCTRL_MASK (0x3 << S2MPS14_ENCTRL_SHIFT) + +/* + * Values of regulator operation modes match device tree bindings. + */ +enum s2mps14_regulator_opmode { + S2MPS14_REGULATOR_OPMODE_OFF = 0, + S2MPS14_REGULATOR_OPMODE_ON = 1, + /* Reserved for compatibility with S5M8767 where this + * is a low power mode. */ + S2MPS14_REGULATOR_OPMODE_RESERVED = 2, + S2MPS14_REGULATOR_OPMODE_SUSPEND = 3, + + S2MPS14_REGULATOR_OPMODE_MAX, +}; + #endif /* __LINUX_MFD_S2MPS14_H */