iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

regulator: Convert rc5t583 to set_voltage

Browse Source 
Not every regulator driver should implement set_voltage_sel callback.
See commit e8eef82
"regulator: Provide a selector based set_voltage_sel() operation".

For rc5t583, the regulator voltage can be mapped onto selector values with a
simple calculation, thus implement set_voltage is better than set_voltage_sel.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin 2012-04-05 14:07:36 +08:00 committed by Mark Brown
parent dd16b1f8e7
commit f604c10cde
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/regulator/rc5t583-regulator.c
View File

@ -124,19 +124,26 @@ static int rc5t583_list_voltage(struct regulator_dev *rdev, unsigned selector)
return ri->min_uV + (ri->step_uV * selector); return ri->min_uV + (ri->step_uV * selector);
} }
static int rc5t583_set_voltage_sel(struct regulator_dev *rdev, static int rc5t583_set_voltage(struct regulator_dev *rdev,
unsigned int selector) int min_uV, int max_uV, unsigned *selector)
{ {
struct rc5t583_regulator *reg = rdev_get_drvdata(rdev); struct rc5t583_regulator *reg = rdev_get_drvdata(rdev);
struct rc5t583_regulator_info *ri = reg->reg_info; struct rc5t583_regulator_info *ri = reg->reg_info;
int ret; int sel, ret;
if (selector >= rdev->desc->n_voltages) {
dev_err(&rdev->dev, "Invalid selector 0x%02x\n", selector); if (min_uV < ri->min_uV)
min_uV = ri->min_uV;
sel = DIV_ROUND_UP(min_uV - ri->min_uV, ri->step_uV);
if (sel >= rdev->desc->n_voltages) {
dev_err(&rdev->dev, "Invalid selector 0x%02x\n", sel);
return -EINVAL; return -EINVAL;
} }
ret = rc5t583_update(reg->mfd->dev, ri->vout_reg, *selector = sel;
selector, ri->vout_mask);
ret = rc5t583_update(reg->mfd->dev, ri->vout_reg, sel, ri->vout_mask);
if (ret < 0) if (ret < 0)
dev_err(&rdev->dev, dev_err(&rdev->dev,
"Error in update voltage register 0x%02x\n", ri->vout_reg); "Error in update voltage register 0x%02x\n", ri->vout_reg);
@ -191,7 +198,7 @@ static struct regulator_ops rc5t583_ops = {
.disable = rc5t583_reg_disable, .disable = rc5t583_reg_disable,
.enable_time = rc5t583_regulator_enable_time, .enable_time = rc5t583_regulator_enable_time,
.get_voltage_sel = rc5t583_get_voltage_sel, .get_voltage_sel = rc5t583_get_voltage_sel,
.set_voltage_sel = rc5t583_set_voltage_sel, .set_voltage = rc5t583_set_voltage,
.list_voltage = rc5t583_list_voltage, .list_voltage = rc5t583_list_voltage,
.set_voltage_time_sel = rc5t583_set_voltage_time_sel, .set_voltage_time_sel = rc5t583_set_voltage_time_sel,
}; };