Re: [PATCH] regulator: s2mps11: add support for S2MPS15 regulators

["Krzysztof Kozłowski" <k.kozlowski@samsung.com>]

On 14.10.2014 10:17, Thomas Abraham wrote:
> The S2MPS15 PMIC is similar in functionality to S2MPS11/14 PMIC. It contains
> 27 LDO and 10 Buck regulators and allows programming these regulators via a
> I2C interface. This patch adds initial support for LDO/Buck regulators of
> S2MPS15 PMIC.
> 
> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>

Just two questions/ideas:
1. No specific steps for suspend?
2. Maybe add S2MPS15 to MODULE_DESCRIPTION and Kconfig?

Anyway rest looks fine.
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>

Best regards,
Krzysztof

> ---
>  drivers/regulator/s2mps11.c |  133 +++++++++++++++++++++++++++++++++++++++++++
>  1 files changed, 133 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
> index adab82d..e176fbb 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/s2mps15.h>
>  #include <linux/mfd/samsung/s2mpu02.h>
>  
>  struct s2mps11_info {
> @@ -529,6 +530,133 @@ static const struct regulator_desc s2mps14_regulators[] = {
>  	regulator_desc_s2mps14_buck(5, MIN_600_MV, STEP_6_25_MV),
>  };
>  
> +static struct regulator_ops s2mps15_reg_ldo_ops = {
> +	.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,
> +};
> +
> +static struct regulator_ops s2mps15_reg_buck_ops = {
> +	.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_sel	= regulator_set_voltage_time_sel,
> +};
> +
> +#define regulator_desc_s2mps15_ldo(num, range) {	\
> +	.name		= "LDO"#num,			\
> +	.id		= S2MPS15_LDO##num,		\
> +	.ops		= &s2mps15_reg_ldo_ops,		\
> +	.type		= REGULATOR_VOLTAGE,		\
> +	.owner		= THIS_MODULE,			\
> +	.linear_ranges	= range,			\
> +	.n_linear_ranges = ARRAY_SIZE(range),		\
> +	.n_voltages	= S2MPS15_LDO_N_VOLTAGES,	\
> +	.vsel_reg	= S2MPS15_REG_L1CTRL + num - 1,	\
> +	.vsel_mask	= S2MPS15_LDO_VSEL_MASK,	\
> +	.enable_reg	= S2MPS15_REG_L1CTRL + num - 1,	\
> +	.enable_mask	= S2MPS15_ENABLE_MASK		\
> +}
> +
> +#define regulator_desc_s2mps15_buck(num, range) {			\
> +	.name		= "BUCK"#num,					\
> +	.id		= S2MPS15_BUCK##num,				\
> +	.ops		= &s2mps15_reg_buck_ops,			\
> +	.type		= REGULATOR_VOLTAGE,				\
> +	.owner		= THIS_MODULE,					\
> +	.linear_ranges	= range,					\
> +	.n_linear_ranges = ARRAY_SIZE(range),				\
> +	.ramp_delay	= 12500,					\
> +	.n_voltages	= S2MPS15_BUCK_N_VOLTAGES,			\
> +	.vsel_reg	= S2MPS15_REG_B1CTRL2 + ((num - 1) * 2),	\
> +	.vsel_mask	= S2MPS15_BUCK_VSEL_MASK,			\
> +	.enable_reg	= S2MPS15_REG_B1CTRL1 + ((num - 1) * 2),	\
> +	.enable_mask	= S2MPS14_ENABLE_MASK				\
> +}
> +
> +/* voltage range for s2mps15 LDO 3, 5, 15, 16, 18, 20, 23 and 27 */
> +static const struct regulator_linear_range s2mps15_ldo_voltage_ranges1[] = {
> +	REGULATOR_LINEAR_RANGE(1000000, 0xc, 0x38, 25000),
> +};
> +
> +/* voltage range for s2mps15 LDO 2, 6, 14, 17, 19, 21, 24 and 25 */
> +static const struct regulator_linear_range s2mps15_ldo_voltage_ranges2[] = {
> +	REGULATOR_LINEAR_RANGE(1800000, 0x0, 0x3f, 25000),
> +};
> +
> +/* voltage range for s2mps15 LDO 4, 11, 12, 13, 22 and 26 */
> +static const struct regulator_linear_range s2mps15_ldo_voltage_ranges3[] = {
> +	REGULATOR_LINEAR_RANGE(700000, 0x0, 0x34, 12500),
> +};
> +
> +/* voltage range for s2mps15 LDO 7, 8, 9 and 10 */
> +static const struct regulator_linear_range s2mps15_ldo_voltage_ranges4[] = {
> +	REGULATOR_LINEAR_RANGE(700000, 0xc, 0x18, 25000),
> +};
> +
> +/* voltage range for s2mps15 LDO 1 */
> +static const struct regulator_linear_range s2mps15_ldo_voltage_ranges5[] = {
> +	REGULATOR_LINEAR_RANGE(500000, 0x0, 0x20, 12500),
> +};
> +
> +/* voltage range for s2mps15 BUCK 1, 2, 3, 4, 5, 6 and 7 */
> +static const struct regulator_linear_range s2mps15_buck_voltage_ranges1[] = {
> +	REGULATOR_LINEAR_RANGE(500000, 0x10, 0xb0, 6250),
> +};
> +
> +/* voltage range for s2mps15 BUCK 8, 9 and 10 */
> +static const struct regulator_linear_range s2mps15_buck_voltage_ranges2[] = {
> +	REGULATOR_LINEAR_RANGE(1000000, 0x20, 0xc0, 12500),
> +};
> +
> +static const struct regulator_desc s2mps15_regulators[] = {
> +	regulator_desc_s2mps15_ldo(1, s2mps15_ldo_voltage_ranges5),
> +	regulator_desc_s2mps15_ldo(2, s2mps15_ldo_voltage_ranges2),
> +	regulator_desc_s2mps15_ldo(3, s2mps15_ldo_voltage_ranges1),
> +	regulator_desc_s2mps15_ldo(4, s2mps15_ldo_voltage_ranges3),
> +	regulator_desc_s2mps15_ldo(5, s2mps15_ldo_voltage_ranges1),
> +	regulator_desc_s2mps15_ldo(6, s2mps15_ldo_voltage_ranges2),
> +	regulator_desc_s2mps15_ldo(7, s2mps15_ldo_voltage_ranges4),
> +	regulator_desc_s2mps15_ldo(8, s2mps15_ldo_voltage_ranges4),
> +	regulator_desc_s2mps15_ldo(9, s2mps15_ldo_voltage_ranges4),
> +	regulator_desc_s2mps15_ldo(10, s2mps15_ldo_voltage_ranges4),
> +	regulator_desc_s2mps15_ldo(11, s2mps15_ldo_voltage_ranges3),
> +	regulator_desc_s2mps15_ldo(12, s2mps15_ldo_voltage_ranges3),
> +	regulator_desc_s2mps15_ldo(13, s2mps15_ldo_voltage_ranges3),
> +	regulator_desc_s2mps15_ldo(14, s2mps15_ldo_voltage_ranges2),
> +	regulator_desc_s2mps15_ldo(15, s2mps15_ldo_voltage_ranges1),
> +	regulator_desc_s2mps15_ldo(16, s2mps15_ldo_voltage_ranges1),
> +	regulator_desc_s2mps15_ldo(17, s2mps15_ldo_voltage_ranges2),
> +	regulator_desc_s2mps15_ldo(18, s2mps15_ldo_voltage_ranges1),
> +	regulator_desc_s2mps15_ldo(19, s2mps15_ldo_voltage_ranges2),
> +	regulator_desc_s2mps15_ldo(20, s2mps15_ldo_voltage_ranges1),
> +	regulator_desc_s2mps15_ldo(21, s2mps15_ldo_voltage_ranges2),
> +	regulator_desc_s2mps15_ldo(22, s2mps15_ldo_voltage_ranges3),
> +	regulator_desc_s2mps15_ldo(23, s2mps15_ldo_voltage_ranges1),
> +	regulator_desc_s2mps15_ldo(24, s2mps15_ldo_voltage_ranges2),
> +	regulator_desc_s2mps15_ldo(25, s2mps15_ldo_voltage_ranges2),
> +	regulator_desc_s2mps15_ldo(26, s2mps15_ldo_voltage_ranges3),
> +	regulator_desc_s2mps15_ldo(27, s2mps15_ldo_voltage_ranges1),
> +	regulator_desc_s2mps15_buck(1, s2mps15_buck_voltage_ranges1),
> +	regulator_desc_s2mps15_buck(2, s2mps15_buck_voltage_ranges1),
> +	regulator_desc_s2mps15_buck(3, s2mps15_buck_voltage_ranges1),
> +	regulator_desc_s2mps15_buck(4, s2mps15_buck_voltage_ranges1),
> +	regulator_desc_s2mps15_buck(5, s2mps15_buck_voltage_ranges1),
> +	regulator_desc_s2mps15_buck(6, s2mps15_buck_voltage_ranges1),
> +	regulator_desc_s2mps15_buck(7, s2mps15_buck_voltage_ranges1),
> +	regulator_desc_s2mps15_buck(8, s2mps15_buck_voltage_ranges2),
> +	regulator_desc_s2mps15_buck(9, s2mps15_buck_voltage_ranges2),
> +	regulator_desc_s2mps15_buck(10, s2mps15_buck_voltage_ranges2),
> +};
> +
>  static int s2mps14_pmic_enable_ext_control(struct s2mps11_info *s2mps11,
>  		struct regulator_dev *rdev)
>  {
> @@ -835,6 +963,10 @@ static int s2mps11_pmic_probe(struct platform_device *pdev)
>  		s2mps11->rdev_num = ARRAY_SIZE(s2mps14_regulators);
>  		regulators = s2mps14_regulators;
>  		break;
> +	case S2MPS15X:
> +		s2mps11->rdev_num = ARRAY_SIZE(s2mps15_regulators);
> +		regulators = s2mps15_regulators;
> +		break;
>  	case S2MPU02:
>  		s2mps11->rdev_num = ARRAY_SIZE(s2mpu02_regulators);
>  		regulators = s2mpu02_regulators;
> @@ -928,6 +1060,7 @@ out:
>  static const struct platform_device_id s2mps11_pmic_id[] = {
>  	{ "s2mps11-pmic", S2MPS11X},
>  	{ "s2mps14-pmic", S2MPS14X},
> +	{ "s2mps15-pmic", S2MPS15X},
>  	{ "s2mpu02-pmic", S2MPU02},
>  	{ },
>  };
>