diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2009-03-13 17:54:54 -0700 |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2009-03-31 09:56:28 +0100 |
| commit | 52914eaa49bf732b091dbf5467ce4c7507c2d32a (patch) | |
| tree | aaa1b1f305e6c556320c89cfaaa8b47fea89fc29 | |
| parent | cd94b5053081963614f6ad77b9b66a7968056c84 (diff) | |
| download | op-kernel-dev-52914eaa49bf732b091dbf5467ce4c7507c2d32a.zip op-kernel-dev-52914eaa49bf732b091dbf5467ce4c7507c2d32a.tar.gz | |
twl4030-regulator: expose VPLL2
Add VPLL2 to the set of twl4030-family regulators exposed for
use by various drivers. It's commonly used to power the digital
video outputs (e.g. LCD or DVI displays) on OMAP3 systems.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
| -rw-r--r-- | drivers/mfd/twl4030-core.c | 2 | ||||
| -rw-r--r-- | drivers/regulator/twl4030-regulator.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c index 68826f1..ec90e95 100644 --- a/drivers/mfd/twl4030-core.c +++ b/drivers/mfd/twl4030-core.c @@ -592,11 +592,9 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features) /* maybe add LDOs that are omitted on cost-reduced parts */ if (twl_has_regulator() && !(features & TPS_SUBSET)) { - /* child = add_regulator(TWL4030_REG_VPLL2, pdata->vpll2); if (IS_ERR(child)) return PTR_ERR(child); - */ child = add_regulator(TWL4030_REG_VMMC2, pdata->vmmc2); if (IS_ERR(child)) diff --git a/drivers/regulator/twl4030-regulator.c b/drivers/regulator/twl4030-regulator.c index 49c41fc..f3ec98c 100644 --- a/drivers/regulator/twl4030-regulator.c +++ b/drivers/regulator/twl4030-regulator.c @@ -396,8 +396,8 @@ static struct twlreg_info twl4030_regs[] = { TWL_ADJUSTABLE_LDO(VMMC2, 0x2b, 6), /* TWL_ADJUSTABLE_LDO(VPLL1, 0x2f, 7), - TWL_ADJUSTABLE_LDO(VPLL2, 0x33, 8), */ + TWL_ADJUSTABLE_LDO(VPLL2, 0x33, 8), TWL_ADJUSTABLE_LDO(VSIM, 0x37, 9), TWL_ADJUSTABLE_LDO(VDAC, 0x3b, 10), /* |
