Commit 4bcb9f43 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown

regulator: twl: Convert twl6030ldo_ops to [get|set]_voltage_sel

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent a3cb80f4
...@@ -560,37 +560,27 @@ static struct regulator_ops twl6030coresmps_ops = { ...@@ -560,37 +560,27 @@ static struct regulator_ops twl6030coresmps_ops = {
}; };
static int static int
twl6030ldo_set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV, twl6030ldo_set_voltage_sel(struct regulator_dev *rdev, unsigned selector)
unsigned *selector)
{ {
struct twlreg_info *info = rdev_get_drvdata(rdev); struct twlreg_info *info = rdev_get_drvdata(rdev);
int vsel;
if ((min_uV/1000 < info->min_mV) || (max_uV/1000 > info->max_mV)) return twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_VOLTAGE,
return -EDOM; selector);
vsel = DIV_ROUND_UP(min_uV - rdev->desc->min_uV, rdev->desc->uV_step);
*selector = vsel;
return twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_VOLTAGE, vsel);
} }
static int twl6030ldo_get_voltage(struct regulator_dev *rdev) static int twl6030ldo_get_voltage_sel(struct regulator_dev *rdev)
{ {
struct twlreg_info *info = rdev_get_drvdata(rdev); struct twlreg_info *info = rdev_get_drvdata(rdev);
int vsel = twlreg_read(info, TWL_MODULE_PM_RECEIVER, VREG_VOLTAGE); int vsel = twlreg_read(info, TWL_MODULE_PM_RECEIVER, VREG_VOLTAGE);
if (vsel < 0) return vsel;
return vsel;
return rdev->desc->min_uV + vsel * rdev->desc->uV_step;
} }
static struct regulator_ops twl6030ldo_ops = { static struct regulator_ops twl6030ldo_ops = {
.list_voltage = regulator_list_voltage_linear, .list_voltage = regulator_list_voltage_linear,
.set_voltage = twl6030ldo_set_voltage, .set_voltage_sel = twl6030ldo_set_voltage_sel,
.get_voltage = twl6030ldo_get_voltage, .get_voltage_sel = twl6030ldo_get_voltage_sel,
.enable = twl6030reg_enable, .enable = twl6030reg_enable,
.disable = twl6030reg_disable, .disable = twl6030reg_disable,
......
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