aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mfd/twl4030-core.c2
-rw-r--r--drivers/regulator/twl4030-regulator.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c
index 68826f1e36bc..ec90e953adce 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)
592 592
593 /* maybe add LDOs that are omitted on cost-reduced parts */ 593 /* maybe add LDOs that are omitted on cost-reduced parts */
594 if (twl_has_regulator() && !(features & TPS_SUBSET)) { 594 if (twl_has_regulator() && !(features & TPS_SUBSET)) {
595 /*
596 child = add_regulator(TWL4030_REG_VPLL2, pdata->vpll2); 595 child = add_regulator(TWL4030_REG_VPLL2, pdata->vpll2);
597 if (IS_ERR(child)) 596 if (IS_ERR(child))
598 return PTR_ERR(child); 597 return PTR_ERR(child);
599 */
600 598
601 child = add_regulator(TWL4030_REG_VMMC2, pdata->vmmc2); 599 child = add_regulator(TWL4030_REG_VMMC2, pdata->vmmc2);
602 if (IS_ERR(child)) 600 if (IS_ERR(child))
diff --git a/drivers/regulator/twl4030-regulator.c b/drivers/regulator/twl4030-regulator.c
index 49c41fc60aa6..f3ec98c83e90 100644
--- a/drivers/regulator/twl4030-regulator.c
+++ b/drivers/regulator/twl4030-regulator.c
@@ -396,8 +396,8 @@ static struct twlreg_info twl4030_regs[] = {
396 TWL_ADJUSTABLE_LDO(VMMC2, 0x2b, 6), 396 TWL_ADJUSTABLE_LDO(VMMC2, 0x2b, 6),
397 /* 397 /*
398 TWL_ADJUSTABLE_LDO(VPLL1, 0x2f, 7), 398 TWL_ADJUSTABLE_LDO(VPLL1, 0x2f, 7),
399 TWL_ADJUSTABLE_LDO(VPLL2, 0x33, 8),
400 */ 399 */
400 TWL_ADJUSTABLE_LDO(VPLL2, 0x33, 8),
401 TWL_ADJUSTABLE_LDO(VSIM, 0x37, 9), 401 TWL_ADJUSTABLE_LDO(VSIM, 0x37, 9),
402 TWL_ADJUSTABLE_LDO(VDAC, 0x3b, 10), 402 TWL_ADJUSTABLE_LDO(VDAC, 0x3b, 10),
403 /* 403 /*