---

yaml --- r: 140265 b: refs/heads/master c: 52914ea h: refs/heads/master i: 140263: 3ef7376 v: v3
git-mirror · Mar 31, 2009 · 5b2f4c1 · 5b2f4c1
1 parent 11907a1
commit 5b2f4c1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd94b5053081963614f6ad77b9b66a7968056c84
+refs/heads/master: 52914eaa49bf732b091dbf5467ce4c7507c2d32a
diff --git a/trunk/drivers/mfd/twl4030-core.c b/trunk/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/trunk/drivers/regulator/twl4030-regulator.c b/trunk/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),
 	/*