twl-regulator: Add all twl4030 regulators to twlreg_info

Define all twl4030 regulators in the twlreg_info table, along with
appropriate VSEL tables for adjustable regulators

Signed-off-by: Juha Keski-Saari <ext-juha.1.keski-saari@nokia.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>

1 files changed, 17 insertions, 9 deletions

diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
index 7ea1c3a31081..43d7494fbd8e 100644
--- a/drivers/regulator/twl-regulator.c
+++ b/drivers/regulator/twl-regulator.c
@@ -294,6 +294,18 @@ static const u16 VSIM_VSEL_table[] = {
 static const u16 VDAC_VSEL_table[] = {
         1200, 1300, 1800, 1800,
 };
+static const u16 VDD1_VSEL_table[] = {
+        800, 1450,
+};
+static const u16 VDD2_VSEL_table[] = {
+        800, 1450, 1500,
+};
+static const u16 VIO_VSEL_table[] = {
+        1800, 1850,
+};
+static const u16 VINTANA2_VSEL_table[] = {
+        2500, 2750,
+};
 static const u16 VAUX1_6030_VSEL_table[] = {
         1000, 1300, 1800, 2500,
         2800, 2900, 3000, 3000,
@@ -464,20 +476,16 @@ static struct twlreg_info twl_regs[] = {
         TWL4030_ADJUSTABLE_LDO(VAUX4, 0x23, 4),
         TWL4030_ADJUSTABLE_LDO(VMMC1, 0x27, 5),
         TWL4030_ADJUSTABLE_LDO(VMMC2, 0x2b, 6),
-        /*
         TWL4030_ADJUSTABLE_LDO(VPLL1, 0x2f, 7),
-        */
         TWL4030_ADJUSTABLE_LDO(VPLL2, 0x33, 8),
         TWL4030_ADJUSTABLE_LDO(VSIM, 0x37, 9),
         TWL4030_ADJUSTABLE_LDO(VDAC, 0x3b, 10),
-        /*
-        TWL4030_ADJUSTABLE_LDO(VINTANA1, 0x3f, 11),
+        TWL4030_FIXED_LDO(VINTANA1, 0x3f, 11),
         TWL4030_ADJUSTABLE_LDO(VINTANA2, 0x43, 12),
-        TWL4030_ADJUSTABLE_LDO(VINTDIG, 0x47, 13),
-        TWL4030_SMPS(VIO, 0x4b, 14),
-        TWL4030_SMPS(VDD1, 0x55, 15),
-        TWL4030_SMPS(VDD2, 0x63, 16),
-         */
+        TWL4030_FIXED_LDO(VINTDIG, 0x47, 13),
+        TWL4030_ADJUSTABLE_LDO(VIO, 0x4b, 14),
+        TWL4030_ADJUSTABLE_LDO(VDD1, 0x55, 15),
+        TWL4030_ADJUSTABLE_LDO(VDD2, 0x63, 16),
         TWL4030_FIXED_LDO(VUSB1V5, 0x71, 1500, 17),
         TWL4030_FIXED_LDO(VUSB1V8, 0x74, 1800, 18),
         TWL4030_FIXED_LDO(VUSB3V1, 0x77, 3100, 19),