Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'regulator/fix/twl' into tmp

Browse source
This commit is contained in:
Mark Brown 2013-03-05 10:12:43 +08:00
commit 8870d4029a
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/regulator/twl-regulator.c
View file

@ -471,24 +471,23 @@ twl4030ldo_set_voltage_sel(struct regulator_dev *rdev, unsigned selector)
selector); selector);
} }
static int twl4030ldo_get_voltage(struct regulator_dev *rdev) static int twl4030ldo_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, int vsel = twlreg_read(info, TWL_MODULE_PM_RECEIVER, VREG_VOLTAGE);
VREG_VOLTAGE);
if (vsel < 0) if (vsel < 0)
return vsel; return vsel;
vsel &= info->table_len - 1; vsel &= info->table_len - 1;
return LDO_MV(info->table[vsel]) * 1000; return vsel;
} }
static struct regulator_ops twl4030ldo_ops = { static struct regulator_ops twl4030ldo_ops = {
.list_voltage = twl4030ldo_list_voltage, .list_voltage = twl4030ldo_list_voltage,
.set_voltage_sel = twl4030ldo_set_voltage_sel, .set_voltage_sel = twl4030ldo_set_voltage_sel,
.get_voltage = twl4030ldo_get_voltage, .get_voltage_sel = twl4030ldo_get_voltage_sel,
.enable = twl4030reg_enable, .enable = twl4030reg_enable,
.disable = twl4030reg_disable, .disable = twl4030reg_disable,