net: fix for utsrelease.h moving to generated

[linux-2.6-block.git] / drivers / regulator / twl4030-regulator.c

diff --git a/drivers/regulator/twl4030-regulator.c b/drivers/regulator/twl4030-regulator.c
index 49c41fc60aa6169188e5c022d0802180f8356573..e2032fb60b556cc0619eed628fb605b8ca62deeb 100644 (file)
--- a/drivers/regulator/twl4030-regulator.c
+++ b/drivers/regulator/twl4030-regulator.c
@@ -193,6 +193,9 @@ static int twl4030reg_set_mode(struct regulator_dev *rdev, unsigned mode)
  *
  * VSEL values documented as "TI cannot support these values" are flagged
  * in these tables as UNSUP() values; we normally won't assign them.
+ *
+ * VAUX3 at 3V is incorrectly listed in some TI manuals as unsupported.
+ * TI are revising the twl5030/tps659x0 specs to support that 3.0V setting.
  */
 #ifdef CONFIG_TWL4030_ALLOW_UNSUPPORTED
 #define UNSUP_MASK     0x0000
@@ -223,7 +226,7 @@ static const u16 VAUX2_VSEL_table[] = {
 };
 static const u16 VAUX3_VSEL_table[] = {
        1500, 1800, 2500, 2800,
-       UNSUP(3000), UNSUP(3000), UNSUP(3000), UNSUP(3000),
+       3000, 3000, 3000, 3000,
 };
 static const u16 VAUX4_VSEL_table[] = {
        700, 1000, 1200, UNSUP(1300),
@@ -396,8 +399,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),
        /*