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: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c
index afc5894d02a0f1b79c6df554361d3e3532d3b889..769b34bd48e445880ac0920423d9b73eabaf4cb7 100644 (file)
--- a/drivers/mfd/twl4030-core.c
+++ b/drivers/mfd/twl4030-core.c
@@ -613,11 +613,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 f4275509170ad515839866782c7cd6db80c9607b..cc125965dfcfeed2baf8491c7613486d5eb7aa8f 100644 (file)
--- a/drivers/regulator/twl4030-regulator.c
+++ b/drivers/regulator/twl4030-regulator.c
@@ -401,8 +401,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),
        /*