Re: [PATCH 2/4] regulator: s2mps11: Add support S2MPU02 regulator device

From: Krzysztof Kozlowski
Date: Thu May 29 2014 - 04:51:24 EST

Hi Chanwoo,

Few ideas below:


On Åro, 2014-05-28 at 20:10 +0900, Chanwoo Choi wrote:
> This patch add S2MPU02 regulator device to existing S2MPS11 device driver
> because of existing a litthe different between S2MPS1x and S2MPU02. The S2MPU02

Fix a typo and language:
"because of little differences between S2MPS1x and S2MPU02"


> regulator device includes LDO[1-28] and BUCK[1-7].
>
> Signed-off-by: Chanwoo Choi <cw00.choi@xxxxxxxxxxx>
>
> ---
> drivers/mfd/sec-core.c | 26 +++
> drivers/regulator/s2mps11.c | 310 ++++++++++++++++++++++++++++++++++--
> include/linux/mfd/samsung/s2mpu02.h | 201 +++++++++++++++++++++++
> 3 files changed, 521 insertions(+), 16 deletions(-)
> create mode 100644 include/linux/mfd/samsung/s2mpu02.h
>

(...)

> diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
> index 02e2fb2..064d44b 100644
> --- a/drivers/regulator/s2mps11.c
> +++ b/drivers/regulator/s2mps11.c
> @@ -31,6 +31,7 @@
> #include <linux/mfd/samsung/core.h>
> #include <linux/mfd/samsung/s2mps11.h>
> #include <linux/mfd/samsung/s2mps14.h>
> +#include <linux/mfd/samsung/s2mpu02.h>
>
> struct s2mps11_info {
> unsigned int rdev_num;
> @@ -40,11 +41,16 @@ struct s2mps11_info {
> int ramp_delay16;
> int ramp_delay7810;
> int ramp_delay9;
> +
> + enum sec_device_type dev_type;
> +
> /*
> - * One bit for each S2MPS14 regulator whether the suspend mode
> + * One bit for each S2MPS14/S2MPU02 regulator whether the suspend mode
> * was enabled.
> */
> unsigned int s2mps14_suspend_state:30;
> + unsigned long long s2mpu02_suspend_state:35;
> +

Why do not re-use the already present 's2mps14_suspend_state' field?
Change it to 'unsigned long long:35' and use it for both s2mps14 and
s2mpu02 suspend states?


> /* Array of size rdev_num with GPIO-s for external sleep control */
> int *ext_control_gpio;
> };
> @@ -415,12 +421,24 @@ static int s2mps14_regulator_enable(struct regulator_dev *rdev)
> struct s2mps11_info *s2mps11 = rdev_get_drvdata(rdev);
> unsigned int val;
>
> - if (s2mps11->s2mps14_suspend_state & (1 << rdev_get_id(rdev)))
> - val = S2MPS14_ENABLE_SUSPEND;
> - else if (gpio_is_valid(s2mps11->ext_control_gpio[rdev_get_id(rdev)]))
> - val = S2MPS14_ENABLE_EXT_CONTROL;
> - else
> - val = rdev->desc->enable_mask;
> + switch (s2mps11->dev_type) {
> + case S2MPS14X:
> + if (s2mps11->s2mps14_suspend_state & (1 << rdev_get_id(rdev)))
> + val = S2MPS14_ENABLE_SUSPEND;
> + else if (gpio_is_valid(s2mps11->ext_control_gpio[rdev_get_id(rdev)]))
> + val = S2MPS14_ENABLE_EXT_CONTROL;
> + else
> + val = rdev->desc->enable_mask;
> + break;
> + case S2MPU02:
> + if (s2mps11->s2mpu02_suspend_state & (1 << rdev_get_id(rdev)))
> + val = S2MPU02_ENABLE_SUSPEND;
> + else
> + val = rdev->desc->enable_mask;
> + break;
> + default:
> + return -EINVAL;
> + };
>
> return regmap_update_bits(rdev->regmap, rdev->desc->enable_reg,
> rdev->desc->enable_mask, val);
> @@ -431,16 +449,44 @@ static int s2mps14_regulator_set_suspend_disable(struct regulator_dev *rdev)
> int ret;
> unsigned int val;
> struct s2mps11_info *s2mps11 = rdev_get_drvdata(rdev);
> + int rdev_id = rdev_get_id(rdev);
>
> - /* LDO3 should be always on and does not support suspend mode */
> - if (rdev_get_id(rdev) == S2MPS14_LDO3)
> - return 0;
> + /* Below LDO should be always on or does not support suspend mode. */
> + switch (s2mps11->dev_type) {
> + case S2MPS14X:
> + switch (rdev_id) {
> + case S2MPS14_LDO3:
> + return 0;
> + };
> + case S2MPU02:
> + switch (rdev_id) {
> + case S2MPU02_LDO13:
> + case S2MPU02_LDO14:
> + case S2MPU02_LDO15:
> + case S2MPU02_LDO16:
> + case S2MPU02_LDO17:
> + case S2MPU02_BUCK7:
> + return 0;
> + };
> + default:
> + return -EINVAL;
> + };
>
> ret = regmap_read(rdev->regmap, rdev->desc->enable_reg, &val);
> if (ret < 0)
> return ret;
>
> - s2mps11->s2mps14_suspend_state |= (1 << rdev_get_id(rdev));
> + switch (s2mps11->dev_type) {
> + case S2MPS14X:
> + s2mps11->s2mps14_suspend_state |= (1 << rdev_get_id(rdev));
> + break;
> + case S2MPU02:
> + s2mps11->s2mpu02_suspend_state |= (1 << rdev_get_id(rdev));
> + break;
> + default:
> + return -EINVAL;
> + };
> +
> /*
> * Don't enable suspend mode if regulator is already disabled because
> * this would effectively for a short time turn on the regulator after
> @@ -625,6 +671,233 @@ static int s2mps11_pmic_dt_parse(struct platform_device *pdev,
> return 0;
> }
>
> +static int s2mpu02_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay)
> +{
> + unsigned int ramp_val, ramp_shift, ramp_reg;
> +
> + switch (rdev_get_id(rdev)) {
> + case S2MPU02_BUCK1:
> + ramp_shift = S2MPU02_BUCK1_RAMP_SHIFT;
> + break;
> + case S2MPU02_BUCK2:
> + ramp_shift = S2MPU02_BUCK2_RAMP_SHIFT;
> + break;
> + case S2MPU02_BUCK3:
> + ramp_shift = S2MPU02_BUCK3_RAMP_SHIFT;
> + break;
> + case S2MPU02_BUCK4:
> + ramp_shift = S2MPU02_BUCK4_RAMP_SHIFT;
> + break;
> + default:
> + return 0;
> + }
> + ramp_reg = S2MPU02_REG_RAMP1;
> + ramp_val = get_ramp_delay(ramp_delay);
> +
> + return regmap_update_bits(rdev->regmap, ramp_reg,
> + S2MPU02_BUCK1234_RAMP_MASK << ramp_shift,
> + ramp_val << ramp_shift);
> +}
> +
> +static struct regulator_ops s2mpu02_ldo_ops = {
> + .list_voltage = regulator_list_voltage_linear,
> + .map_voltage = regulator_map_voltage_linear,
> + .is_enabled = regulator_is_enabled_regmap,
> + .enable = s2mps14_regulator_enable,
> + .disable = regulator_disable_regmap,
> + .get_voltage_sel = regulator_get_voltage_sel_regmap,
> + .set_voltage_sel = regulator_set_voltage_sel_regmap,
> + .set_voltage_time_sel = regulator_set_voltage_time_sel,
> + .set_suspend_disable = s2mps14_regulator_set_suspend_disable,
> +};
> +
> +static struct regulator_ops s2mpu02_buck_ops = {
> + .list_voltage = regulator_list_voltage_linear,
> + .map_voltage = regulator_map_voltage_linear,
> + .is_enabled = regulator_is_enabled_regmap,
> + .enable = s2mps14_regulator_enable,
> + .disable = regulator_disable_regmap,
> + .get_voltage_sel = regulator_get_voltage_sel_regmap,
> + .set_voltage_sel = regulator_set_voltage_sel_regmap,
> + .set_voltage_time_sel = regulator_set_voltage_time_sel,
> + .set_suspend_disable = s2mps14_regulator_set_suspend_disable,
> + .set_ramp_delay = s2mpu02_set_ramp_delay,
> +};
> +
> +#define regulator_desc_s2mpu02_ldo1(num) { \
> + .name = "LDO"#num, \
> + .id = S2MPU02_LDO##num, \
> + .ops = &s2mpu02_ldo_ops, \
> + .type = REGULATOR_VOLTAGE, \
> + .owner = THIS_MODULE, \
> + .min_uV = S2MPU02_LDO_MIN_900MV, \
> + .uV_step = S2MPU02_LDO_STEP_12_5MV, \
> + .n_voltages = S2MPU02_LDO_N_VOLTAGES, \
> + .vsel_reg = S2MPU02_REG_L1CTRL, \
> + .vsel_mask = S2MPU02_LDO_VSEL_MASK, \
> + .enable_reg = S2MPU02_REG_L1CTRL, \
> + .enable_mask = S2MPU02_ENABLE_MASK \
> +}
> +#define regulator_desc_s2mpu02_ldo2(num) { \
> + .name = "LDO"#num, \
> + .id = S2MPU02_LDO##num, \
> + .ops = &s2mpu02_ldo_ops, \
> + .type = REGULATOR_VOLTAGE, \
> + .owner = THIS_MODULE, \
> + .min_uV = S2MPU02_LDO_MIN_1050MV, \
> + .uV_step = S2MPU02_LDO_STEP_25MV, \
> + .n_voltages = S2MPU02_LDO_N_VOLTAGES, \
> + .vsel_reg = S2MPU02_REG_L2CTRL1, \
> + .vsel_mask = S2MPU02_LDO_VSEL_MASK, \
> + .enable_reg = S2MPU02_REG_L2CTRL1, \
> + .enable_mask = S2MPU02_ENABLE_MASK \
> +}
> +#define regulator_desc_s2mpu02_ldo3(num) { \
> + .name = "LDO"#num, \
> + .id = S2MPU02_LDO##num, \
> + .ops = &s2mpu02_ldo_ops, \
> + .type = REGULATOR_VOLTAGE, \
> + .owner = THIS_MODULE, \
> + .min_uV = S2MPU02_LDO_MIN_900MV, \
> + .uV_step = S2MPU02_LDO_STEP_12_5MV, \
> + .n_voltages = S2MPU02_LDO_N_VOLTAGES, \
> + .vsel_reg = S2MPU02_REG_L3CTRL + num - 3, \
> + .vsel_mask = S2MPU02_LDO_VSEL_MASK, \
> + .enable_reg = S2MPU02_REG_L3CTRL + num - 3, \
> + .enable_mask = S2MPU02_ENABLE_MASK \
> +}
> +#define regulator_desc_s2mpu02_ldo4(num) { \
> + .name = "LDO"#num, \
> + .id = S2MPU02_LDO##num, \
> + .ops = &s2mpu02_ldo_ops, \
> + .type = REGULATOR_VOLTAGE, \
> + .owner = THIS_MODULE, \
> + .min_uV = S2MPU02_LDO_MIN_1050MV, \
> + .uV_step = S2MPU02_LDO_STEP_25MV, \
> + .n_voltages = S2MPU02_LDO_N_VOLTAGES, \
> + .vsel_reg = S2MPU02_REG_L3CTRL + num - 3, \
> + .vsel_mask = S2MPU02_LDO_VSEL_MASK, \
> + .enable_reg = S2MPU02_REG_L3CTRL + num - 3, \
> + .enable_mask = S2MPU02_ENABLE_MASK \
> +}
> +#define regulator_desc_s2mpu02_ldo5(num) { \
> + .name = "LDO"#num, \
> + .id = S2MPU02_LDO##num, \
> + .ops = &s2mpu02_ldo_ops, \
> + .type = REGULATOR_VOLTAGE, \
> + .owner = THIS_MODULE, \
> + .min_uV = S2MPU02_LDO_MIN_1600MV, \
> + .uV_step = S2MPU02_LDO_STEP_50MV, \
> + .n_voltages = S2MPU02_LDO_N_VOLTAGES, \
> + .vsel_reg = S2MPU02_REG_L3CTRL + num - 3, \
> + .vsel_mask = S2MPU02_LDO_VSEL_MASK, \
> + .enable_reg = S2MPU02_REG_L3CTRL + num - 3, \
> + .enable_mask = S2MPU02_ENABLE_MASK \
> +}
> +
> +#define regulator_desc_s2mpu02_buck1234(num) { \
> + .name = "BUCK"#num, \
> + .id = S2MPU02_BUCK##num, \
> + .ops = &s2mpu02_buck_ops, \
> + .type = REGULATOR_VOLTAGE, \
> + .owner = THIS_MODULE, \
> + .min_uV = S2MPU02_BUCK1234_MIN_600MV, \
> + .uV_step = S2MPU02_BUCK1234_STEP_6_25MV, \
> + .n_voltages = S2MPU02_BUCK_N_VOLTAGES, \
> + .linear_min_sel = S2MPU02_BUCK1234_START_SEL, \
> + .ramp_delay = S2MPU02_BUCK_RAMP_DELAY, \
> + .vsel_reg = S2MPU02_REG_B1CTRL2 + (num - 1) * 2, \
> + .vsel_mask = S2MPU02_BUCK_VSEL_MASK, \
> + .enable_reg = S2MPU02_REG_B1CTRL1 + (num - 1) * 2, \
> + .enable_mask = S2MPU02_ENABLE_MASK \
> +}
> +#define regulator_desc_s2mpu02_buck5(num) { \
> + .name = "BUCK"#num, \
> + .id = S2MPU02_BUCK##num, \
> + .ops = &s2mpu02_ldo_ops, \
> + .type = REGULATOR_VOLTAGE, \
> + .owner = THIS_MODULE, \
> + .min_uV = S2MPU02_BUCK5_MIN_1081_25MV, \
> + .uV_step = S2MPU02_BUCK5_STEP_6_25MV, \
> + .n_voltages = S2MPU02_BUCK_N_VOLTAGES, \
> + .linear_min_sel = S2MPU02_BUCK5_START_SEL, \
> + .ramp_delay = S2MPU02_BUCK_RAMP_DELAY, \
> + .vsel_reg = S2MPU02_REG_B5CTRL2, \
> + .vsel_mask = S2MPU02_BUCK_VSEL_MASK, \
> + .enable_reg = S2MPU02_REG_B5CTRL1, \
> + .enable_mask = S2MPU02_ENABLE_MASK \
> +}
> +#define regulator_desc_s2mpu02_buck6(num) { \
> + .name = "BUCK"#num, \
> + .id = S2MPU02_BUCK##num, \
> + .ops = &s2mpu02_ldo_ops, \
> + .type = REGULATOR_VOLTAGE, \
> + .owner = THIS_MODULE, \
> + .min_uV = S2MPU02_BUCK6_MIN_1700MV, \
> + .uV_step = S2MPU02_BUCK6_STEP_2_50MV, \
> + .n_voltages = S2MPU02_BUCK_N_VOLTAGES, \
> + .linear_min_sel = S2MPU02_BUCK6_START_SEL, \
> + .ramp_delay = S2MPU02_BUCK_RAMP_DELAY, \
> + .vsel_reg = S2MPU02_REG_B6CTRL2, \
> + .vsel_mask = S2MPU02_BUCK_VSEL_MASK, \
> + .enable_reg = S2MPU02_REG_B6CTRL1, \
> + .enable_mask = S2MPU02_ENABLE_MASK \
> +}
> +#define regulator_desc_s2mpu02_buck7(num) { \
> + .name = "BUCK"#num, \
> + .id = S2MPU02_BUCK##num, \
> + .ops = &s2mpu02_ldo_ops, \
> + .type = REGULATOR_VOLTAGE, \
> + .owner = THIS_MODULE, \
> + .min_uV = S2MPU02_BUCK7_MIN_900MV, \
> + .uV_step = S2MPU02_BUCK7_STEP_6_25MV, \
> + .n_voltages = S2MPU02_BUCK_N_VOLTAGES, \
> + .linear_min_sel = S2MPU02_BUCK7_START_SEL, \
> + .ramp_delay = S2MPU02_BUCK_RAMP_DELAY, \
> + .vsel_reg = S2MPU02_REG_B7CTRL2, \
> + .vsel_mask = S2MPU02_BUCK_VSEL_MASK, \
> + .enable_reg = S2MPU02_REG_B7CTRL1, \
> + .enable_mask = S2MPU02_ENABLE_MASK \
> +}
> +
> +static const struct regulator_desc s2mpu02_regulators[] = {
> + regulator_desc_s2mpu02_ldo1(1),
> + regulator_desc_s2mpu02_ldo2(2),
> + regulator_desc_s2mpu02_ldo4(3),
> + regulator_desc_s2mpu02_ldo5(4),
> + regulator_desc_s2mpu02_ldo4(5),
> + regulator_desc_s2mpu02_ldo3(6),
> + regulator_desc_s2mpu02_ldo3(7),
> + regulator_desc_s2mpu02_ldo4(8),
> + regulator_desc_s2mpu02_ldo5(9),
> + regulator_desc_s2mpu02_ldo3(10),
> + regulator_desc_s2mpu02_ldo4(11),
> + regulator_desc_s2mpu02_ldo5(12),
> + regulator_desc_s2mpu02_ldo5(13),
> + regulator_desc_s2mpu02_ldo5(14),
> + regulator_desc_s2mpu02_ldo5(15),
> + regulator_desc_s2mpu02_ldo5(16),
> + regulator_desc_s2mpu02_ldo4(17),
> + regulator_desc_s2mpu02_ldo5(18),
> + regulator_desc_s2mpu02_ldo3(19),
> + regulator_desc_s2mpu02_ldo4(20),
> + regulator_desc_s2mpu02_ldo5(21),
> + regulator_desc_s2mpu02_ldo5(22),
> + regulator_desc_s2mpu02_ldo5(23),
> + regulator_desc_s2mpu02_ldo4(24),
> + regulator_desc_s2mpu02_ldo5(25),
> + regulator_desc_s2mpu02_ldo4(26),
> + regulator_desc_s2mpu02_ldo5(27),
> + regulator_desc_s2mpu02_ldo5(28),
> + regulator_desc_s2mpu02_buck1234(1),
> + regulator_desc_s2mpu02_buck1234(2),
> + regulator_desc_s2mpu02_buck1234(3),
> + regulator_desc_s2mpu02_buck1234(4),
> + regulator_desc_s2mpu02_buck5(5),
> + regulator_desc_s2mpu02_buck6(6),
> + regulator_desc_s2mpu02_buck7(7),
> +};
> +
> static int s2mps11_pmic_probe(struct platform_device *pdev)
> {
> struct sec_pmic_dev *iodev = dev_get_drvdata(pdev->dev.parent);
> @@ -634,15 +907,14 @@ static int s2mps11_pmic_probe(struct platform_device *pdev)
> struct s2mps11_info *s2mps11;
> int i, ret = 0;
> const struct regulator_desc *regulators;
> - enum sec_device_type dev_type;
>
> s2mps11 = devm_kzalloc(&pdev->dev, sizeof(struct s2mps11_info),
> GFP_KERNEL);
> if (!s2mps11)
> return -ENOMEM;
>
> - dev_type = platform_get_device_id(pdev)->driver_data;
> - switch (dev_type) {
> + s2mps11->dev_type = platform_get_device_id(pdev)->driver_data;
> + switch (s2mps11->dev_type) {
> case S2MPS11X:
> s2mps11->rdev_num = ARRAY_SIZE(s2mps11_regulators);
> regulators = s2mps11_regulators;
> @@ -651,8 +923,13 @@ static int s2mps11_pmic_probe(struct platform_device *pdev)
> s2mps11->rdev_num = ARRAY_SIZE(s2mps14_regulators);
> regulators = s2mps14_regulators;
> break;
> + case S2MPU02:
> + s2mps11->rdev_num = ARRAY_SIZE(s2mpu02_regulators);
> + regulators = s2mpu02_regulators;
> + break;
> default:
> - dev_err(&pdev->dev, "Invalid device type: %u\n", dev_type);
> + dev_err(&pdev->dev, "Invalid device type: %u\n",
> + s2mps11->dev_type);
> return -EINVAL;
> };
>
> @@ -686,7 +963,7 @@ static int s2mps11_pmic_probe(struct platform_device *pdev)
> for (i = 0; i < s2mps11->rdev_num; i++)
> rdata[i].name = regulators[i].name;
>
> - ret = s2mps11_pmic_dt_parse(pdev, rdata, s2mps11, dev_type);
> + ret = s2mps11_pmic_dt_parse(pdev, rdata, s2mps11, s2mps11->dev_type);

I think you can get rid of last parameter of s2mps11_pmic_dt_parse().
The function already received a pointer to 'struct s2mps11_info' and it
will be called after setting 's2mps11->dev_type' so the last parameter
is not needed.

> if (ret)
> goto out;
>
> @@ -739,6 +1016,7 @@ out:
> static const struct platform_device_id s2mps11_pmic_id[] = {
> { "s2mps11-pmic", S2MPS11X},
> { "s2mps14-pmic", S2MPS14X},
> + { "s2mpu02-pmic", S2MPU02},
> { },
> };
> MODULE_DEVICE_TABLE(platform, s2mps11_pmic_id);
> diff --git a/include/linux/mfd/samsung/s2mpu02.h b/include/linux/mfd/samsung/s2mpu02.h
> new file mode 100644
> index 0000000..98406f4
> --- /dev/null
> +++ b/include/linux/mfd/samsung/s2mpu02.h
> @@ -0,0 +1,201 @@
> +/*
> + * s2mpu02.h
> + *
> + * Copyright (c) 2014 Samsung Electronics Co., Ltd
> + * http://www.samsung.com
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms of the GNU General Public License as published by the
> + * Free Software Foundation; either version 2 of the License, or (at your
> + * option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + */
> +
> +#ifndef __LINUX_MFD_S2MPU02_H
> +#define __LINUX_MFD_S2MPU02_H
> +
> +/* S2MPU02 registers */
> +enum S2MPU02_reg {
> + S2MPU02_REG_ID,
> + S2MPU02_REG_INT1,
> + S2MPU02_REG_INT2,
> + S2MPU02_REG_INT3,
> + S2MPU02_REG_INT1M,
> + S2MPU02_REG_INT2M,
> + S2MPU02_REG_INT3M,
> + S2MPU02_REG_ST1,
> + S2MPU02_REG_ST2,
> + S2MPU02_REG_PWRONSRC,
> + S2MPU02_REG_OFFSRC,
> + S2MPU02_REG_BU_CHG,
> + S2MPU02_REG_RTCCTRL,
> + S2MPU02_REG_PMCTRL1,
> + S2MPU02_REG_RSVD1,
> + S2MPU02_REG_RSVD2,
> + S2MPU02_REG_RSVD3,
> + S2MPU02_REG_RSVD4,
> + S2MPU02_REG_RSVD5,
> + S2MPU02_REG_RSVD6,
> + S2MPU02_REG_RSVD7,
> + S2MPU02_REG_WRSTEN,
> + S2MPU02_REG_RSVD8,
> + S2MPU02_REG_RSVD9,
> + S2MPU02_REG_RSVD10,
> + S2MPU02_REG_B1CTRL1,
> + S2MPU02_REG_B1CTRL2,
> + S2MPU02_REG_B2CTRL1,
> + S2MPU02_REG_B2CTRL2,
> + S2MPU02_REG_B3CTRL1,
> + S2MPU02_REG_B3CTRL2,
> + S2MPU02_REG_B4CTRL1,
> + S2MPU02_REG_B4CTRL2,
> + S2MPU02_REG_B5CTRL1,
> + S2MPU02_REG_B5CTRL2,
> + S2MPU02_REG_B5CTRL3,
> + S2MPU02_REG_B5CTRL4,
> + S2MPU02_REG_B5CTRL5,
> + S2MPU02_REG_B6CTRL1,
> + S2MPU02_REG_B6CTRL2,
> + S2MPU02_REG_B7CTRL1,
> + S2MPU02_REG_B7CTRL2,
> + S2MPU02_REG_RAMP1,
> + S2MPU02_REG_RAMP2,
> + S2MPU02_REG_L1CTRL,
> + S2MPU02_REG_L2CTRL1,
> + S2MPU02_REG_L2CTRL2,
> + S2MPU02_REG_L2CTRL3,
> + S2MPU02_REG_L2CTRL4,
> + S2MPU02_REG_L3CTRL,
> + S2MPU02_REG_L4CTRL,
> + S2MPU02_REG_L5CTRL,
> + S2MPU02_REG_L6CTRL,
> + S2MPU02_REG_L7CTRL,
> + S2MPU02_REG_L8CTRL,
> + S2MPU02_REG_L9CTRL,
> + S2MPU02_REG_L10CTRL,
> + S2MPU02_REG_L11CTRL,
> + S2MPU02_REG_L12CTRL,
> + S2MPU02_REG_L13CTRL,
> + S2MPU02_REG_L14CTRL,
> + S2MPU02_REG_L15CTRL,
> + S2MPU02_REG_L16CTRL,
> + S2MPU02_REG_L17CTRL,
> + S2MPU02_REG_L18CTRL,
> + S2MPU02_REG_L19CTRL,
> + S2MPU02_REG_L20CTRL,
> + S2MPU02_REG_L21CTRL,
> + S2MPU02_REG_L22CTRL,
> + S2MPU02_REG_L23CTRL,
> + S2MPU02_REG_L24CTRL,
> + S2MPU02_REG_L25CTRL,
> + S2MPU02_REG_L26CTRL,
> + S2MPU02_REG_L27CTRL,
> + S2MPU02_REG_L28CTRL,
> + S2MPU02_REG_LDODSCH1,
> + S2MPU02_REG_LDODSCH2,
> + S2MPU02_REG_LDODSCH3,
> + S2MPU02_REG_LDODSCH4,
> + S2MPU02_REG_SELMIF,
> + S2MPU02_REG_RSVD11,
> + S2MPU02_REG_RSVD12,
> + S2MPU02_REG_RSVD13,
> + S2MPU02_REG_DVSSEL,
> + S2MPU02_REG_DVSPTR,
> + S2MPU02_REG_DVSDATA,
> +};
> +
> +/* S2MPU02 regulator ids */
> +enum S2MPU02_regulators {
> + S2MPU02_LDO1,
> + S2MPU02_LDO2,
> + S2MPU02_LDO3,
> + S2MPU02_LDO4,
> + S2MPU02_LDO5,
> + S2MPU02_LDO6,
> + S2MPU02_LDO7,
> + S2MPU02_LDO8,
> + S2MPU02_LDO9,
> + S2MPU02_LDO10,
> + S2MPU02_LDO11,
> + S2MPU02_LDO12,
> + S2MPU02_LDO13,
> + S2MPU02_LDO14,
> + S2MPU02_LDO15,
> + S2MPU02_LDO16,
> + S2MPU02_LDO17,
> + S2MPU02_LDO18,
> + S2MPU02_LDO19,
> + S2MPU02_LDO20,
> + S2MPU02_LDO21,
> + S2MPU02_LDO22,
> + S2MPU02_LDO23,
> + S2MPU02_LDO24,
> + S2MPU02_LDO25,
> + S2MPU02_LDO26,
> + S2MPU02_LDO27,
> + S2MPU02_LDO28,
> + S2MPU02_BUCK1,
> + S2MPU02_BUCK2,
> + S2MPU02_BUCK3,
> + S2MPU02_BUCK4,
> + S2MPU02_BUCK5,
> + S2MPU02_BUCK6,
> + S2MPU02_BUCK7,
> +
> + S2MPU02_REGULATOR_MAX,
> +};
> +
> +/* Regulator constraints for BUCKx */
> +#define S2MPU02_BUCK1234_MIN_600MV 600000
> +#define S2MPU02_BUCK5_MIN_1081_25MV 1081250
> +#define S2MPU02_BUCK6_MIN_1700MV 1700000
> +#define S2MPU02_BUCK7_MIN_900MV 900000
> +
> +#define S2MPU02_BUCK1234_STEP_6_25MV 6250
> +#define S2MPU02_BUCK5_STEP_6_25MV 6250
> +#define S2MPU02_BUCK6_STEP_2_50MV 2500
> +#define S2MPU02_BUCK7_STEP_6_25MV 6250
> +
> +#define S2MPU02_BUCK1234_START_SEL 0x00
> +#define S2MPU02_BUCK5_START_SEL 0x4D
> +#define S2MPU02_BUCK6_START_SEL 0x28
> +#define S2MPU02_BUCK7_START_SEL 0x30
> +
> +/*
> + * Default ramp delay in uv/us. Datasheet says that ramp delay can be
> + * controlled however it does not specify which register is used for that.
> + * Let's assume that default value will be set.
> + */

The comment above applies only to S2MPS14 which does not describe the
register for setting ramp delay. On S2MPU02 the ramp delay can be set so
this comment is misleading.

Best regards,
Krzysztof

> +#define S2MPU02_BUCK_RAMP_DELAY 12500
> +
> +/* Regulator constraints for different types of LDOx */
> +#define S2MPU02_LDO_MIN_900MV 900000
> +#define S2MPU02_LDO_MIN_1050MV 1050000
> +#define S2MPU02_LDO_MIN_1600MV 1600000
> +#define S2MPU02_LDO_STEP_12_5MV 12500
> +#define S2MPU02_LDO_STEP_25MV 25000
> +#define S2MPU02_LDO_STEP_50MV 50000
> +
> +#define S2MPU02_LDO_VSEL_MASK 0x3F
> +#define S2MPU02_BUCK_VSEL_MASK 0xFF
> +#define S2MPU02_ENABLE_MASK (0x03 << S2MPU02_ENABLE_SHIFT)
> +#define S2MPU02_ENABLE_SHIFT 6
> +
> +/* On/Off controlled by PWREN */
> +#define S2MPU02_ENABLE_SUSPEND (0x01 << S2MPU02_ENABLE_SHIFT)
> +#define S2MPU02_LDO_N_VOLTAGES (S2MPU02_LDO_VSEL_MASK + 1)
> +#define S2MPU02_BUCK_N_VOLTAGES (S2MPU02_BUCK_VSEL_MASK + 1)
> +
> +/* RAMP delay for BUCK1234*/
> +#define S2MPU02_BUCK1_RAMP_SHIFT 6
> +#define S2MPU02_BUCK2_RAMP_SHIFT 4
> +#define S2MPU02_BUCK3_RAMP_SHIFT 2
> +#define S2MPU02_BUCK4_RAMP_SHIFT 0
> +#define S2MPU02_BUCK1234_RAMP_MASK 0x3
> +
> +#endif /* __LINUX_MFD_S2MPU02_H */

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/