public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

regulator: anatop: Use linear_min_sel with linear mapping

Browse source 
By setting linear_min_sel to anatop_reg->min_bit_val, we can avoid
adjust the anatop_reg->min_bit_val offset in [set|get]_voltage_sel.

With this chance we can refactor this driver to use
regulator_[get|set]_voltage_sel_regmap.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Reviewed-by: Ying-Chun Liu <paulliu@debian.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin 2012-12-09 08:05:45 +08:00 • committed by Mark Brown
parent 5d6e6ffc40
commit 985884db50
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/regulator/anatop-regulator.c
View file

@ -48,18 +48,16 @@ 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 val, mask; u32 mask;
if (!anatop_reg->control_reg) if (!anatop_reg->control_reg)
return -ENOTSUPP; return -ENOTSUPP;
val = anatop_reg->min_bit_val + selector;
dev_dbg(&reg->dev, "%s: calculated val %d\n", __func__, val);
mask = ((1 << anatop_reg->vol_bit_width) - 1) << mask = ((1 << anatop_reg->vol_bit_width) - 1) <<
anatop_reg->vol_bit_shift; anatop_reg->vol_bit_shift;
val <<= anatop_reg->vol_bit_shift; selector <<= anatop_reg->vol_bit_shift;
regmap_update_bits(anatop_reg->anatop, anatop_reg->control_reg, regmap_update_bits(anatop_reg->anatop, anatop_reg->control_reg,
mask, val); mask, selector);
return 0; return 0;
} }
@ -77,7 +75,7 @@ static int anatop_regmap_get_voltage_sel(struct regulator_dev *reg)
anatop_reg->vol_bit_shift; anatop_reg->vol_bit_shift;
val = (val & mask) >> anatop_reg->vol_bit_shift; val = (val & mask) >> anatop_reg->vol_bit_shift;
return val - anatop_reg->min_bit_val; return val;
} }
static struct regulator_ops anatop_rops = { static struct regulator_ops anatop_rops = {
@ -158,10 +156,11 @@ static int __devinit anatop_regulator_probe(struct platform_device *pdev)
goto anatop_probe_end; goto anatop_probe_end;
} }
rdesc->n_voltages = (sreg->max_voltage - sreg->min_voltage) rdesc->n_voltages = (sreg->max_voltage - sreg->min_voltage) / 25000 + 1
/ 25000 + 1; + sreg->min_bit_val;
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;
config.dev = &pdev->dev; config.dev = &pdev->dev;
config.init_data = initdata; config.init_data = initdata;