diff options
| author | Axel Lin <axel.lin@ingics.com> | 2012-12-09 00:05:45 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 03:38:09 (GMT) |
| commit | 985884db501d7026257d122c3cc32a7005a9a864 (patch) | |
| tree | 96379e7eb17813863a6fefe27a08064f2da841de /drivers/regulator | |
| parent | 5d6e6ffc400dbc3ea0cc58b8b6f9d9ac748d6572 (diff) | |
| download | linux-985884db501d7026257d122c3cc32a7005a9a864.tar.xz | |
regulator: anatop: Use linear_min_sel with linear mapping
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>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/anatop-regulator.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/regulator/anatop-regulator.c b/drivers/regulator/anatop-regulator.c index 1af9768..b78b622 100644 --- a/drivers/regulator/anatop-regulator.c +++ b/drivers/regulator/anatop-regulator.c @@ -48,18 +48,16 @@ static int anatop_regmap_set_voltage_sel(struct regulator_dev *reg, unsigned selector) { struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg); - u32 val, mask; + u32 mask; if (!anatop_reg->control_reg) return -ENOTSUPP; - val = anatop_reg->min_bit_val + selector; - dev_dbg(®->dev, "%s: calculated val %d\n", __func__, val); mask = ((1 << anatop_reg->vol_bit_width) - 1) << 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, - mask, val); + mask, selector); return 0; } @@ -77,7 +75,7 @@ static int anatop_regmap_get_voltage_sel(struct regulator_dev *reg) 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 = { @@ -158,10 +156,11 @@ static int __devinit anatop_regulator_probe(struct platform_device *pdev) goto anatop_probe_end; } - rdesc->n_voltages = (sreg->max_voltage - sreg->min_voltage) - / 25000 + 1; + rdesc->n_voltages = (sreg->max_voltage - sreg->min_voltage) / 25000 + 1 + + sreg->min_bit_val; rdesc->min_uV = sreg->min_voltage; rdesc->uV_step = 25000; + rdesc->linear_min_sel = sreg->min_bit_val; config.dev = &pdev->dev; config.init_data = initdata; |