Commit e1b0144f authored by Axel Lin's avatar Axel Lin Committed by Mark Brown

regulator: anatop: Use regulator_[get|set]_voltage_sel_regmap

Call regulator_[get|set]_voltage_sel_regmap instead of open code.
Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Reviewed-by: default avatarYing-Chun Liu <paulliu@debian.org>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 985884db
...@@ -48,34 +48,21 @@ static int anatop_regmap_set_voltage_sel(struct regulator_dev *reg, ...@@ -48,34 +48,21 @@ static int anatop_regmap_set_voltage_sel(struct regulator_dev *reg,
unsigned selector) unsigned selector)
{ {
struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg); struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg);
u32 mask;
if (!anatop_reg->control_reg) if (!anatop_reg->control_reg)
return -ENOTSUPP; return -ENOTSUPP;
mask = ((1 << anatop_reg->vol_bit_width) - 1) << return regulator_set_voltage_sel_regmap(reg, selector);
anatop_reg->vol_bit_shift;
selector <<= anatop_reg->vol_bit_shift;
regmap_update_bits(anatop_reg->anatop, anatop_reg->control_reg,
mask, selector);
return 0;
} }
static int anatop_regmap_get_voltage_sel(struct regulator_dev *reg) static int anatop_regmap_get_voltage_sel(struct regulator_dev *reg)
{ {
struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg); struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg);
u32 val, mask;
if (!anatop_reg->control_reg) if (!anatop_reg->control_reg)
return -ENOTSUPP; return -ENOTSUPP;
regmap_read(anatop_reg->anatop, anatop_reg->control_reg, &val); return regulator_get_voltage_sel_regmap(reg);
mask = ((1 << anatop_reg->vol_bit_width) - 1) <<
anatop_reg->vol_bit_shift;
val = (val & mask) >> anatop_reg->vol_bit_shift;
return val;
} }
static struct regulator_ops anatop_rops = { static struct regulator_ops anatop_rops = {
...@@ -161,11 +148,15 @@ static int __devinit anatop_regulator_probe(struct platform_device *pdev) ...@@ -161,11 +148,15 @@ static int __devinit anatop_regulator_probe(struct platform_device *pdev)
rdesc->min_uV = sreg->min_voltage; rdesc->min_uV = sreg->min_voltage;
rdesc->uV_step = 25000; rdesc->uV_step = 25000;
rdesc->linear_min_sel = sreg->min_bit_val; rdesc->linear_min_sel = sreg->min_bit_val;
rdesc->vsel_reg = sreg->control_reg;
rdesc->vsel_mask = ((1 << sreg->vol_bit_width) - 1) <<
sreg->vol_bit_shift;
config.dev = &pdev->dev; config.dev = &pdev->dev;
config.init_data = initdata; config.init_data = initdata;
config.driver_data = sreg; config.driver_data = sreg;
config.of_node = pdev->dev.of_node; config.of_node = pdev->dev.of_node;
config.regmap = sreg->anatop;
/* register regulator */ /* register regulator */
rdev = regulator_register(rdesc, &config); rdev = regulator_register(rdesc, &config);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment