Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c006b21f authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

regulator: 88pm8607: Use regulator_get_voltage_sel_regmap() 



Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 15b397d7

drivers/regulator/88pm8607.c

+9 −27
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ struct pm8607_regulator_info { 
	unsigned int	*vol_table;

	unsigned int	*vol_suspend;



	int	vol_reg;

	int	vol_shift;

	int	update_reg;

	int	update_bit;

	int	slope_double;
@@ -224,13 +222,13 @@ static int pm8607_list_voltage(struct regulator_dev *rdev, unsigned index) 
static int pm8607_set_voltage_sel(struct regulator_dev *rdev, unsigned selector)

{

	struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);

	uint8_t val, mask;

	uint8_t val;

	int ret;



	val = (uint8_t)(selector << info->vol_shift);

	mask = (rdev->desc->n_voltages - 1)  << info->vol_shift;

	val = (uint8_t)(selector << (ffs(rdev->desc->vsel_mask) - 1));



	ret = pm860x_set_bits(info->i2c, info->vol_reg, mask, selector);

	ret = pm860x_set_bits(info->i2c, rdev->desc->vsel_reg,

			      rdev->desc->vsel_mask, val);

	if (ret)

		return ret;

	switch (info->desc.id) {
@@ -244,26 +242,10 @@ static int pm8607_set_voltage_sel(struct regulator_dev *rdev, unsigned selector) 
	return ret;

}



static int pm8607_get_voltage_sel(struct regulator_dev *rdev)

{

	struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);

	uint8_t val, mask;

	int ret;



	ret = pm860x_reg_read(info->i2c, info->vol_reg);

	if (ret < 0)

		return ret;



	mask = (rdev->desc->n_voltages - 1)  << info->vol_shift;

	val = ((unsigned char)ret & mask) >> info->vol_shift;



	return val;

}



static struct regulator_ops pm8607_regulator_ops = {

	.list_voltage	= pm8607_list_voltage,

	.set_voltage_sel = pm8607_set_voltage_sel,

	.get_voltage_sel = pm8607_get_voltage_sel,

	.get_voltage_sel = regulator_get_voltage_sel_regmap,

	.enable = regulator_enable_regmap,

	.disable = regulator_disable_regmap,

	.is_enabled = regulator_is_enabled_regmap,
@@ -278,11 +260,11 @@ static struct regulator_ops pm8607_regulator_ops = { 
		.id	= PM8607_ID_##vreg,				\

		.owner	= THIS_MODULE,					\

		.n_voltages = ARRAY_SIZE(vreg##_table),			\

		.vsel_reg = PM8607_##vreg,				\

		.vsel_mask = ARRAY_SIZE(vreg##_table) - 1,		\

		.enable_reg = PM8607_##ereg,				\

		.enable_mask = 1 << (ebit),				\

	},								\

	.vol_reg	= PM8607_##vreg,				\

	.vol_shift	= (0),						\

	.update_reg	= PM8607_##ureg,				\

	.update_bit	= (ubit),					\

	.slope_double	= (0),						\
@@ -299,11 +281,11 @@ static struct regulator_ops pm8607_regulator_ops = { 
		.id	= PM8607_ID_LDO##_id,				\

		.owner	= THIS_MODULE,					\

		.n_voltages = ARRAY_SIZE(LDO##_id##_table),		\

		.vsel_reg = PM8607_##vreg,				\

		.vsel_mask = (ARRAY_SIZE(LDO##_id##_table) - 1) << (shift), \

		.enable_reg = PM8607_##ereg,				\

		.enable_mask = 1 << (ebit),				\

	},								\

	.vol_reg	= PM8607_##vreg,				\

	.vol_shift	= (shift),					\

	.slope_double	= (0),						\

	.vol_table	= (unsigned int *)&LDO##_id##_table,		\

	.vol_suspend	= (unsigned int *)&LDO##_id##_suspend_table,	\