diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-08 20:25:17 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-08 20:25:17 -0500 |
| commit | 9a0cee711448335ec43eae83272495e9334c0098 (patch) | |
| tree | 6f5cefee78019cf482220c4c0fef1f29708b32a5 | |
| parent | ee0849c9114a45c1ecd6136623a25f95892c59fe (diff) | |
| parent | c4632aed3e5b134c55b54af19db49662959384c1 (diff) | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fix from Mark Brown:
"Another small, clear fix in a specific driver."
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: tps65910: Configure correct value for VDDCTRL vout reg
| -rw-r--r-- | drivers/regulator/tps65910-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c index 5c15ba01e9c7..40ecf5165899 100644 --- a/drivers/regulator/tps65910-regulator.c +++ b/drivers/regulator/tps65910-regulator.c | |||
| @@ -662,7 +662,7 @@ static int tps65910_set_voltage_dcdc(struct regulator_dev *dev, | |||
| 662 | tps65910_reg_write(pmic, TPS65910_VDD2_OP, vsel); | 662 | tps65910_reg_write(pmic, TPS65910_VDD2_OP, vsel); |
| 663 | break; | 663 | break; |
| 664 | case TPS65911_REG_VDDCTRL: | 664 | case TPS65911_REG_VDDCTRL: |
| 665 | vsel = selector; | 665 | vsel = selector + 3; |
| 666 | tps65910_reg_write(pmic, TPS65911_VDDCTRL_OP, vsel); | 666 | tps65910_reg_write(pmic, TPS65911_VDDCTRL_OP, vsel); |
| 667 | } | 667 | } |
| 668 | 668 | ||