a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

regulator: anatop: Convert to set_voltage_sel and regulator_map_voltage_linear

Browse Source 
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-06-03 23:02:34 +08:00 committed by Mark Brown
parent ea7e330454
commit d01c3a1e1b
1 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/regulator/anatop-regulator.c
View File

@ -43,33 +43,15 @@ struct anatop_regulator {
struct regulator_init_data *initdata; struct regulator_init_data *initdata;
}; };
static int anatop_set_voltage(struct regulator_dev *reg, int min_uV, static int anatop_set_voltage_sel(struct regulator_dev *reg, unsigned selector)
int max_uV, unsigned *selector)
{ {
struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg); struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg);
u32 val, sel, mask; u32 val, mask;
int uv;
uv = min_uV;
dev_dbg(&reg->dev, "%s: uv %d, min %d, max %d\n", __func__,
uv, anatop_reg->min_voltage,
anatop_reg->max_voltage);
if (uv < anatop_reg->min_voltage) {
if (max_uV > anatop_reg->min_voltage)
uv = anatop_reg->min_voltage;
else
return -EINVAL;
}
if (!anatop_reg->control_reg) if (!anatop_reg->control_reg)
return -ENOTSUPP; return -ENOTSUPP;
sel = DIV_ROUND_UP(uv - anatop_reg->min_voltage, 25000); val = anatop_reg->min_bit_val + selector;
if (sel * 25000 + anatop_reg->min_voltage > anatop_reg->max_voltage)
return -EINVAL;
val = anatop_reg->min_bit_val + sel;
*selector = sel;
dev_dbg(&reg->dev, "%s: calculated val %d\n", __func__, val); 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;
@ -95,9 +77,10 @@ static int anatop_get_voltage_sel(struct regulator_dev *reg)
} }
static struct regulator_ops anatop_rops = { static struct regulator_ops anatop_rops = {
.set_voltage = anatop_set_voltage, .set_voltage_sel = anatop_set_voltage_sel,
.get_voltage_sel = anatop_get_voltage_sel, .get_voltage_sel = anatop_get_voltage_sel,
.list_voltage = regulator_list_voltage_linear, .list_voltage = regulator_list_voltage_linear,
.map_voltage = regulator_map_voltage_linear,
}; };
static int __devinit anatop_regulator_probe(struct platform_device *pdev) static int __devinit anatop_regulator_probe(struct platform_device *pdev)