regulator: 88pm8607: Use regulator_get_voltage_sel_regmap()

Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

regulator: 88pm8607: Use regulator_get_voltage_sel_regmap()
Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Axel Lin · Mark Brown
1 parent 15b397d7e7
Showing 1 changed file with 9 additions and 27 deletions Side-by-side Diff
drivers/regulator/88pm8607.c
@@ -27,8 +27,6 @@
 	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_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 @@
 	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 @@
 		.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 @@
 		.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,	\
...	...	@@ -27,8 +27,6 @@
27	27	unsigned int *vol_table;
28	28	unsigned int *vol_suspend;
29	29
30		- int vol_reg;
31		- int vol_shift;
32	30	int update_reg;
33	31	int update_bit;
34	32	int slope_double;
35	33
36	34
...	...	@@ -224,13 +222,13 @@
224	222	static int pm8607_set_voltage_sel(struct regulator_dev *rdev, unsigned selector)
225	223	{
226	224	struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);
227		- uint8_t val, mask;
	225	+ uint8_t val;
228	226	int ret;
229	227
230		- val = (uint8_t)(selector << info->vol_shift);
231		- mask = (rdev->desc->n_voltages - 1) << info->vol_shift;
	228	+ val = (uint8_t)(selector << (ffs(rdev->desc->vsel_mask) - 1));
232	229
233		- ret = pm860x_set_bits(info->i2c, info->vol_reg, mask, selector);
	230	+ ret = pm860x_set_bits(info->i2c, rdev->desc->vsel_reg,
	231	+ rdev->desc->vsel_mask, val);
234	232	if (ret)
235	233	return ret;
236	234	switch (info->desc.id) {
237	235
...	...	@@ -244,26 +242,10 @@
244	242	return ret;
245	243	}
246	244
247		-static int pm8607_get_voltage_sel(struct regulator_dev *rdev)
248		-{
249		- struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);
250		- uint8_t val, mask;
251		- int ret;
252		-
253		- ret = pm860x_reg_read(info->i2c, info->vol_reg);
254		- if (ret < 0)
255		- return ret;
256		-
257		- mask = (rdev->desc->n_voltages - 1) << info->vol_shift;
258		- val = ((unsigned char)ret & mask) >> info->vol_shift;
259		-
260		- return val;
261		-}
262		-
263	245	static struct regulator_ops pm8607_regulator_ops = {
264	246	.list_voltage = pm8607_list_voltage,
265	247	.set_voltage_sel = pm8607_set_voltage_sel,
266		- .get_voltage_sel = pm8607_get_voltage_sel,
	248	+ .get_voltage_sel = regulator_get_voltage_sel_regmap,
267	249	.enable = regulator_enable_regmap,
268	250	.disable = regulator_disable_regmap,
269	251	.is_enabled = regulator_is_enabled_regmap,
270	252
...	...	@@ -278,11 +260,11 @@
278	260	.id = PM8607_ID_##vreg, \
279	261	.owner = THIS_MODULE, \
280	262	.n_voltages = ARRAY_SIZE(vreg##_table), \
	263	+ .vsel_reg = PM8607_##vreg, \
	264	+ .vsel_mask = ARRAY_SIZE(vreg##_table) - 1, \
281	265	.enable_reg = PM8607_##ereg, \
282	266	.enable_mask = 1 << (ebit), \
283	267	}, \
284		- .vol_reg = PM8607_##vreg, \
285		- .vol_shift = (0), \
286	268	.update_reg = PM8607_##ureg, \
287	269	.update_bit = (ubit), \
288	270	.slope_double = (0), \
289	271
...	...	@@ -299,11 +281,11 @@
299	281	.id = PM8607_ID_LDO##_id, \
300	282	.owner = THIS_MODULE, \
301	283	.n_voltages = ARRAY_SIZE(LDO##_id##_table), \
	284	+ .vsel_reg = PM8607_##vreg, \
	285	+ .vsel_mask = (ARRAY_SIZE(LDO##_id##_table) - 1) << (shift), \
302	286	.enable_reg = PM8607_##ereg, \
303	287	.enable_mask = 1 << (ebit), \
304	288	}, \
305		- .vol_reg = PM8607_##vreg, \
306		- .vol_shift = (shift), \
307	289	.slope_double = (0), \
308	290	.vol_table = (unsigned int *)&LDO##_id##_table, \
309	291	.vol_suspend = (unsigned int *)&LDO##_id##_suspend_table, \