6 files changed, 91 insertions, 91 deletions

diff --git a/Documentation/devicetree/bindings/regulator/twl-regulator.txt b/Documentation/devicetree/bindings/regulator/twl-regulator.txt
index 658749b90b97..75b0c1669504 100644
--- a/Documentation/devicetree/bindings/regulator/twl-regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/twl-regulator.txt
@@ -18,20 +18,20 @@ For twl6030 regulators/LDOs
   - "ti,twl6030-vdd1" for VDD1 SMPS
   - "ti,twl6030-vdd2" for VDD2 SMPS
   - "ti,twl6030-vdd3" for VDD3 SMPS
-For twl6025 regulators/LDOs
+For twl6032 regulators/LDOs
 - compatible:
-  - "ti,twl6025-ldo1" for LDO1 LDO
-  - "ti,twl6025-ldo2" for LDO2 LDO
-  - "ti,twl6025-ldo3" for LDO3 LDO
-  - "ti,twl6025-ldo4" for LDO4 LDO
-  - "ti,twl6025-ldo5" for LDO5 LDO
-  - "ti,twl6025-ldo6" for LDO6 LDO
-  - "ti,twl6025-ldo7" for LDO7 LDO
-  - "ti,twl6025-ldoln" for LDOLN LDO
-  - "ti,twl6025-ldousb" for LDOUSB LDO
-  - "ti,twl6025-smps3" for SMPS3 SMPS
-  - "ti,twl6025-smps4" for SMPS4 SMPS
-  - "ti,twl6025-vio" for VIO SMPS
+  - "ti,twl6032-ldo1" for LDO1 LDO
+  - "ti,twl6032-ldo2" for LDO2 LDO
+  - "ti,twl6032-ldo3" for LDO3 LDO
+  - "ti,twl6032-ldo4" for LDO4 LDO
+  - "ti,twl6032-ldo5" for LDO5 LDO
+  - "ti,twl6032-ldo6" for LDO6 LDO
+  - "ti,twl6032-ldo7" for LDO7 LDO
+  - "ti,twl6032-ldoln" for LDOLN LDO
+  - "ti,twl6032-ldousb" for LDOUSB LDO
+  - "ti,twl6032-smps3" for SMPS3 SMPS
+  - "ti,twl6032-smps4" for SMPS4 SMPS
+  - "ti,twl6032-vio" for VIO SMPS
 For twl4030 regulators/LDOs
 - compatible:
   - "ti,twl4030-vaux1" for VAUX1 LDO
diff --git a/Documentation/devicetree/bindings/usb/twlxxxx-usb.txt b/Documentation/devicetree/bindings/usb/twlxxxx-usb.txt
index 36b9aede3f40..0aee0ad3f035 100644
--- a/Documentation/devicetree/bindings/usb/twlxxxx-usb.txt
+++ b/Documentation/devicetree/bindings/usb/twlxxxx-usb.txt
@@ -8,7 +8,7 @@ TWL6030 USB COMPARATOR
    usb interrupt number that raises VBUS interrupts when the controller has to
    act as device
  - usb-supply : phandle to the regulator device tree node. It should be vusb
-   if it is twl6030 or ldousb if it is twl6025 subclass.
+   if it is twl6030 or ldousb if it is twl6032 subclass.
 
 twl6030-usb {
         compatible = "ti,twl6030-usb";
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index dbd52b373b27..7f150d94d295 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -118,7 +118,7 @@
 #define TWL6030_BASEADD_GASGAUGE        0x00C0
 #define TWL6030_BASEADD_PIH             0x00D0
 #define TWL6030_BASEADD_CHARGER         0x00E0
-#define TWL6025_BASEADD_CHARGER         0x00DA
+#define TWL6032_BASEADD_CHARGER         0x00DA
 #define TWL6030_BASEADD_LED             0x00F4
 
 /* subchip/slave 2 0x4A - DFT */
@@ -718,9 +718,9 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
                                         | REGULATOR_CHANGE_STATUS,
                         };
 
-                        if (features & TWL6025_SUBCLASS) {
+                        if (features & TWL6032_SUBCLASS) {
                                 usb3v3.supply = "ldousb";
-                                regulator = TWL6025_REG_LDOUSB;
+                                regulator = TWL6032_REG_LDOUSB;
                         } else {
                                 usb3v3.supply = "vusb";
                                 regulator = TWL6030_REG_VUSB;
@@ -747,8 +747,8 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
                         usb3v3.dev_name = dev_name(child);
         } else if (IS_ENABLED(CONFIG_REGULATOR_TWL4030) &&
                    twl_class_is_6030()) {
-                if (features & TWL6025_SUBCLASS)
-                        child = add_regulator(TWL6025_REG_LDOUSB,
+                if (features & TWL6032_SUBCLASS)
+                        child = add_regulator(TWL6032_REG_LDOUSB,
                                                 pdata->ldousb, features);
                 else
                         child = add_regulator(TWL6030_REG_VUSB,
@@ -872,7 +872,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
 
         /* twl6030 regulators */
         if (IS_ENABLED(CONFIG_REGULATOR_TWL4030) && twl_class_is_6030() &&
-                        !(features & TWL6025_SUBCLASS)) {
+                        !(features & TWL6032_SUBCLASS)) {
                 child = add_regulator(TWL6030_REG_VDD1, pdata->vdd1,
                                         features);
                 if (IS_ERR(child))
@@ -952,60 +952,60 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
                         return PTR_ERR(child);
         }
 
-        /* twl6025 regulators */
+        /* twl6032 regulators */
         if (IS_ENABLED(CONFIG_REGULATOR_TWL4030) && twl_class_is_6030() &&
-                        (features & TWL6025_SUBCLASS)) {
-                child = add_regulator(TWL6025_REG_LDO5, pdata->ldo5,
+                        (features & TWL6032_SUBCLASS)) {
+                child = add_regulator(TWL6032_REG_LDO5, pdata->ldo5,
                                         features);
                 if (IS_ERR(child))
                         return PTR_ERR(child);
 
-                child = add_regulator(TWL6025_REG_LDO1, pdata->ldo1,
+                child = add_regulator(TWL6032_REG_LDO1, pdata->ldo1,
                                         features);
                 if (IS_ERR(child))
                         return PTR_ERR(child);
 
-                child = add_regulator(TWL6025_REG_LDO7, pdata->ldo7,
+                child = add_regulator(TWL6032_REG_LDO7, pdata->ldo7,
                                         features);
                 if (IS_ERR(child))
                         return PTR_ERR(child);
 
-                child = add_regulator(TWL6025_REG_LDO6, pdata->ldo6,
+                child = add_regulator(TWL6032_REG_LDO6, pdata->ldo6,
                                         features);
                 if (IS_ERR(child))
                         return PTR_ERR(child);
 
-                child = add_regulator(TWL6025_REG_LDOLN, pdata->ldoln,
+                child = add_regulator(TWL6032_REG_LDOLN, pdata->ldoln,
                                         features);
                 if (IS_ERR(child))
                         return PTR_ERR(child);
 
-                child = add_regulator(TWL6025_REG_LDO2, pdata->ldo2,
+                child = add_regulator(TWL6032_REG_LDO2, pdata->ldo2,
                                         features);
                 if (IS_ERR(child))
                         return PTR_ERR(child);
 
-                child = add_regulator(TWL6025_REG_LDO4, pdata->ldo4,
+                child = add_regulator(TWL6032_REG_LDO4, pdata->ldo4,
                                         features);
                 if (IS_ERR(child))
                         return PTR_ERR(child);
 
-                child = add_regulator(TWL6025_REG_LDO3, pdata->ldo3,
+                child = add_regulator(TWL6032_REG_LDO3, pdata->ldo3,
                                         features);
                 if (IS_ERR(child))
                         return PTR_ERR(child);
 
-                child = add_regulator(TWL6025_REG_SMPS3, pdata->smps3,
+                child = add_regulator(TWL6032_REG_SMPS3, pdata->smps3,
                                         features);
                 if (IS_ERR(child))
                         return PTR_ERR(child);
 
-                child = add_regulator(TWL6025_REG_SMPS4, pdata->smps4,
+                child = add_regulator(TWL6032_REG_SMPS4, pdata->smps4,
                                         features);
                 if (IS_ERR(child))
                         return PTR_ERR(child);
 
-                child = add_regulator(TWL6025_REG_VIO, pdata->vio6025,
+                child = add_regulator(TWL6032_REG_VIO, pdata->vio6025,
                                         features);
                 if (IS_ERR(child))
                         return PTR_ERR(child);
@@ -1184,10 +1184,10 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id)
         if ((id->driver_data) & TWL6030_CLASS) {
                 twl_priv->twl_id = TWL6030_CLASS_ID;
                 twl_priv->twl_map = &twl6030_map[0];
-                /* The charger base address is different in twl6025 */
-                if ((id->driver_data) & TWL6025_SUBCLASS)
+                /* The charger base address is different in twl6032 */
+                if ((id->driver_data) & TWL6032_SUBCLASS)
                         twl_priv->twl_map[TWL_MODULE_MAIN_CHARGE].base =
-                                                        TWL6025_BASEADD_CHARGER;
+                                                        TWL6032_BASEADD_CHARGER;
                 twl_regmap_config = twl6030_regmap_config;
         } else {
                 twl_priv->twl_id = TWL4030_CLASS_ID;
@@ -1296,7 +1296,7 @@ static const struct i2c_device_id twl_ids[] = {
         { "tps65921", TPS_SUBSET },     /* fewer LDOs; no codec, no LED
                                            and vibrator. Charger in USB module*/
         { "twl6030", TWL6030_CLASS },   /* "Phoenix power chip" */
-        { "twl6025", TWL6030_CLASS | TWL6025_SUBCLASS }, /* "Phoenix lite" */
+        { "twl6032", TWL6030_CLASS | TWL6032_SUBCLASS }, /* "Phoenix lite" */
         { /* end of list */ },
 };
 MODULE_DEVICE_TABLE(i2c, twl_ids);
diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
index fb6e67d74ffb..93bc4f456da4 100644
--- a/drivers/regulator/twl-regulator.c
+++ b/drivers/regulator/twl-regulator.c
@@ -109,7 +109,7 @@ struct twlreg_info {
 #define SMPS_OFFSET_EN          BIT(0)
 #define SMPS_EXTENDED_EN        BIT(1)
 
-/* twl6025 SMPS EPROM values */
+/* twl6032 SMPS EPROM values */
 #define TWL6030_SMPS_OFFSET             0xB0
 #define TWL6030_SMPS_MULT               0xB3
 #define SMPS_MULTOFFSET_SMPS4   BIT(0)
@@ -173,7 +173,7 @@ static int twl6030reg_is_enabled(struct regulator_dev *rdev)
         struct twlreg_info      *info = rdev_get_drvdata(rdev);
         int                     grp = 0, val;
 
-        if (!(twl_class_is_6030() && (info->features & TWL6025_SUBCLASS))) {
+        if (!(twl_class_is_6030() && (info->features & TWL6032_SUBCLASS))) {
                 grp = twlreg_grp(rdev);
                 if (grp < 0)
                         return grp;
@@ -211,7 +211,7 @@ static int twl6030reg_enable(struct regulator_dev *rdev)
         int                     grp = 0;
         int                     ret;
 
-        if (!(twl_class_is_6030() && (info->features & TWL6025_SUBCLASS)))
+        if (!(twl_class_is_6030() && (info->features & TWL6032_SUBCLASS)))
                 grp = twlreg_grp(rdev);
         if (grp < 0)
                 return grp;
@@ -245,7 +245,7 @@ static int twl6030reg_disable(struct regulator_dev *rdev)
         int                     grp = 0;
         int                     ret;
 
-        if (!(twl_class_is_6030() && (info->features & TWL6025_SUBCLASS)))
+        if (!(twl_class_is_6030() && (info->features & TWL6032_SUBCLASS)))
                 grp = P1_GRP_6030 | P2_GRP_6030 | P3_GRP_6030;
 
         /* For 6030, set the off state for all grps enabled */
@@ -339,7 +339,7 @@ static int twl6030reg_set_mode(struct regulator_dev *rdev, unsigned mode)
         int grp = 0;
         int val;
 
-        if (!(twl_class_is_6030() && (info->features & TWL6025_SUBCLASS)))
+        if (!(twl_class_is_6030() && (info->features & TWL6032_SUBCLASS)))
                 grp = twlreg_grp(rdev);
 
         if (grp < 0)
@@ -899,14 +899,14 @@ static const struct twlreg_info TWL6030_INFO_##label = { \
                 }, \
         }
 
-#define TWL6025_ADJUSTABLE_LDO(label, offset, min_mVolts, max_mVolts) \
-static const struct twlreg_info TWL6025_INFO_##label = { \
+#define TWL6032_ADJUSTABLE_LDO(label, offset, min_mVolts, max_mVolts) \
+static const struct twlreg_info TWL6032_INFO_##label = { \
         .base = offset, \
         .min_mV = min_mVolts, \
         .max_mV = max_mVolts, \
         .desc = { \
                 .name = #label, \
-                .id = TWL6025_REG_##label, \
+                .id = TWL6032_REG_##label, \
                 .n_voltages = 32, \
                 .ops = &twl6030ldo_ops, \
                 .type = REGULATOR_VOLTAGE, \
@@ -933,14 +933,14 @@ static const struct twlreg_info TWLFIXED_INFO_##label = { \
                 }, \
         }
 
-#define TWL6025_ADJUSTABLE_SMPS(label, offset) \
+#define TWL6032_ADJUSTABLE_SMPS(label, offset) \
 static const struct twlreg_info TWLSMPS_INFO_##label = { \
         .base = offset, \
         .min_mV = 600, \
         .max_mV = 2100, \
         .desc = { \
                 .name = #label, \
-                .id = TWL6025_REG_##label, \
+                .id = TWL6032_REG_##label, \
                 .n_voltages = 63, \
                 .ops = &twlsmps_ops, \
                 .type = REGULATOR_VOLTAGE, \
@@ -981,15 +981,15 @@ TWL6030_ADJUSTABLE_LDO(VMMC, 0x68, 1000, 3300);
 TWL6030_ADJUSTABLE_LDO(VPP, 0x6c, 1000, 3300);
 TWL6030_ADJUSTABLE_LDO(VUSIM, 0x74, 1000, 3300);
 /* 6025 are renamed compared to 6030 versions */
-TWL6025_ADJUSTABLE_LDO(LDO2, 0x54, 1000, 3300);
-TWL6025_ADJUSTABLE_LDO(LDO4, 0x58, 1000, 3300);
-TWL6025_ADJUSTABLE_LDO(LDO3, 0x5c, 1000, 3300);
-TWL6025_ADJUSTABLE_LDO(LDO5, 0x68, 1000, 3300);
-TWL6025_ADJUSTABLE_LDO(LDO1, 0x6c, 1000, 3300);
-TWL6025_ADJUSTABLE_LDO(LDO7, 0x74, 1000, 3300);
-TWL6025_ADJUSTABLE_LDO(LDO6, 0x60, 1000, 3300);
-TWL6025_ADJUSTABLE_LDO(LDOLN, 0x64, 1000, 3300);
-TWL6025_ADJUSTABLE_LDO(LDOUSB, 0x70, 1000, 3300);
+TWL6032_ADJUSTABLE_LDO(LDO2, 0x54, 1000, 3300);
+TWL6032_ADJUSTABLE_LDO(LDO4, 0x58, 1000, 3300);
+TWL6032_ADJUSTABLE_LDO(LDO3, 0x5c, 1000, 3300);
+TWL6032_ADJUSTABLE_LDO(LDO5, 0x68, 1000, 3300);
+TWL6032_ADJUSTABLE_LDO(LDO1, 0x6c, 1000, 3300);
+TWL6032_ADJUSTABLE_LDO(LDO7, 0x74, 1000, 3300);
+TWL6032_ADJUSTABLE_LDO(LDO6, 0x60, 1000, 3300);
+TWL6032_ADJUSTABLE_LDO(LDOLN, 0x64, 1000, 3300);
+TWL6032_ADJUSTABLE_LDO(LDOUSB, 0x70, 1000, 3300);
 TWL4030_FIXED_LDO(VINTANA1, 0x3f, 1500, 11, 100, 0x08);
 TWL4030_FIXED_LDO(VINTDIG, 0x47, 1500, 13, 100, 0x08);
 TWL4030_FIXED_LDO(VUSB1V5, 0x71, 1500, 17, 100, 0x08);
@@ -1001,9 +1001,9 @@ TWL6030_FIXED_LDO(VDAC, 0x64, 1800, 0);
 TWL6030_FIXED_LDO(VUSB, 0x70, 3300, 0);
 TWL6030_FIXED_LDO(V1V8, 0x16, 1800, 0);
 TWL6030_FIXED_LDO(V2V1, 0x1c, 2100, 0);
-TWL6025_ADJUSTABLE_SMPS(SMPS3, 0x34);
-TWL6025_ADJUSTABLE_SMPS(SMPS4, 0x10);
-TWL6025_ADJUSTABLE_SMPS(VIO, 0x16);
+TWL6032_ADJUSTABLE_SMPS(SMPS3, 0x34);
+TWL6032_ADJUSTABLE_SMPS(SMPS4, 0x10);
+TWL6032_ADJUSTABLE_SMPS(VIO, 0x16);
 
 static u8 twl_get_smps_offset(void)
 {
@@ -1031,7 +1031,7 @@ static u8 twl_get_smps_mult(void)
 
 #define TWL4030_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWL4030, label)
 #define TWL6030_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWL6030, label)
-#define TWL6025_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWL6025, label)
+#define TWL6032_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWL6032, label)
 #define TWLFIXED_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWLFIXED, label)
 #define TWLSMPS_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWLSMPS, label)
 
@@ -1060,15 +1060,15 @@ static const struct of_device_id twl_of_match[] = {
         TWL6030_OF_MATCH("ti,twl6030-vmmc", VMMC),
         TWL6030_OF_MATCH("ti,twl6030-vpp", VPP),
         TWL6030_OF_MATCH("ti,twl6030-vusim", VUSIM),
-        TWL6025_OF_MATCH("ti,twl6025-ldo2", LDO2),
-        TWL6025_OF_MATCH("ti,twl6025-ldo4", LDO4),
-        TWL6025_OF_MATCH("ti,twl6025-ldo3", LDO3),
-        TWL6025_OF_MATCH("ti,twl6025-ldo5", LDO5),
-        TWL6025_OF_MATCH("ti,twl6025-ldo1", LDO1),
-        TWL6025_OF_MATCH("ti,twl6025-ldo7", LDO7),
-        TWL6025_OF_MATCH("ti,twl6025-ldo6", LDO6),
-        TWL6025_OF_MATCH("ti,twl6025-ldoln", LDOLN),
-        TWL6025_OF_MATCH("ti,twl6025-ldousb", LDOUSB),
+        TWL6032_OF_MATCH("ti,twl6032-ldo2", LDO2),
+        TWL6032_OF_MATCH("ti,twl6032-ldo4", LDO4),
+        TWL6032_OF_MATCH("ti,twl6032-ldo3", LDO3),
+        TWL6032_OF_MATCH("ti,twl6032-ldo5", LDO5),
+        TWL6032_OF_MATCH("ti,twl6032-ldo1", LDO1),
+        TWL6032_OF_MATCH("ti,twl6032-ldo7", LDO7),
+        TWL6032_OF_MATCH("ti,twl6032-ldo6", LDO6),
+        TWL6032_OF_MATCH("ti,twl6032-ldoln", LDOLN),
+        TWL6032_OF_MATCH("ti,twl6032-ldousb", LDOUSB),
         TWLFIXED_OF_MATCH("ti,twl4030-vintana1", VINTANA1),
         TWLFIXED_OF_MATCH("ti,twl4030-vintdig", VINTDIG),
         TWLFIXED_OF_MATCH("ti,twl4030-vusb1v5", VUSB1V5),
@@ -1080,9 +1080,9 @@ static const struct of_device_id twl_of_match[] = {
         TWLFIXED_OF_MATCH("ti,twl6030-vusb", VUSB),
         TWLFIXED_OF_MATCH("ti,twl6030-v1v8", V1V8),
         TWLFIXED_OF_MATCH("ti,twl6030-v2v1", V2V1),
-        TWLSMPS_OF_MATCH("ti,twl6025-smps3", SMPS3),
-        TWLSMPS_OF_MATCH("ti,twl6025-smps4", SMPS4),
-        TWLSMPS_OF_MATCH("ti,twl6025-vio", VIO),
+        TWLSMPS_OF_MATCH("ti,twl6032-smps3", SMPS3),
+        TWLSMPS_OF_MATCH("ti,twl6032-smps4", SMPS4),
+        TWLSMPS_OF_MATCH("ti,twl6032-vio", VIO),
         {},
 };
 MODULE_DEVICE_TABLE(of, twl_of_match);
@@ -1163,19 +1163,19 @@ static int twlreg_probe(struct platform_device *pdev)
         }
 
         switch (id) {
-        case TWL6025_REG_SMPS3:
+        case TWL6032_REG_SMPS3:
                 if (twl_get_smps_mult() & SMPS_MULTOFFSET_SMPS3)
                         info->flags |= SMPS_EXTENDED_EN;
                 if (twl_get_smps_offset() & SMPS_MULTOFFSET_SMPS3)
                         info->flags |= SMPS_OFFSET_EN;
                 break;
-        case TWL6025_REG_SMPS4:
+        case TWL6032_REG_SMPS4:
                 if (twl_get_smps_mult() & SMPS_MULTOFFSET_SMPS4)
                         info->flags |= SMPS_EXTENDED_EN;
                 if (twl_get_smps_offset() & SMPS_MULTOFFSET_SMPS4)
                         info->flags |= SMPS_OFFSET_EN;
                 break;
-        case TWL6025_REG_VIO:
+        case TWL6032_REG_VIO:
                 if (twl_get_smps_mult() & SMPS_MULTOFFSET_VIO)
                         info->flags |= SMPS_EXTENDED_EN;
                 if (twl_get_smps_offset() & SMPS_MULTOFFSET_VIO)
diff --git a/drivers/usb/phy/phy-twl6030-usb.c b/drivers/usb/phy/phy-twl6030-usb.c
index 9de7ada90a8b..1753bd367e0a 100644
--- a/drivers/usb/phy/phy-twl6030-usb.c
+++ b/drivers/usb/phy/phy-twl6030-usb.c
@@ -347,7 +347,7 @@ static int twl6030_usb_probe(struct platform_device *pdev)
         if (np) {
                 twl->regulator = "usb";
         } else if (pdata) {
-                if (pdata->features & TWL6025_SUBCLASS)
+                if (pdata->features & TWL6032_SUBCLASS)
                         twl->regulator = "ldousb";
                 else
                         twl->regulator = "vusb";
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index 2167c0d00abf..81cbbdb96aae 100644
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -725,7 +725,7 @@ struct twl4030_platform_data {
         struct regulator_init_data              *clk32kg;
         struct regulator_init_data              *v1v8;
         struct regulator_init_data              *v2v1;
-        /* TWL6025 LDO regulators */
+        /* TWL6032 LDO regulators */
         struct regulator_init_data              *ldo1;
         struct regulator_init_data              *ldo2;
         struct regulator_init_data              *ldo3;
@@ -735,7 +735,7 @@ struct twl4030_platform_data {
         struct regulator_init_data              *ldo7;
         struct regulator_init_data              *ldoln;
         struct regulator_init_data              *ldousb;
-        /* TWL6025 DCDC regulators */
+        /* TWL6032 DCDC regulators */
         struct regulator_init_data              *smps3;
         struct regulator_init_data              *smps4;
         struct regulator_init_data              *vio6025;
@@ -752,7 +752,7 @@ struct twl_regulator_driver_data {
 #define TPS_SUBSET              BIT(1)  /* tps659[23]0 have fewer LDOs */
 #define TWL5031                 BIT(2)  /* twl5031 has different registers */
 #define TWL6030_CLASS           BIT(3)  /* TWL6030 class */
-#define TWL6025_SUBCLASS        BIT(4)  /* TWL6025 has changed registers */
+#define TWL6032_SUBCLASS        BIT(4)  /* TWL6032 has changed registers */
 #define TWL4030_ALLOW_UNSUPPORTED BIT(5) /* Some voltages are possible
                                           * but not officially supported.
                                           * This flag is necessary to
@@ -839,20 +839,20 @@ static inline int twl4030charger_usb_en(int enable) { return 0; }
 #define TWL6030_REG_CLK32KG     48
 
 /* LDOs on 6025 have different names */
-#define TWL6025_REG_LDO2        49
-#define TWL6025_REG_LDO4        50
-#define TWL6025_REG_LDO3        51
-#define TWL6025_REG_LDO5        52
-#define TWL6025_REG_LDO1        53
-#define TWL6025_REG_LDO7        54
-#define TWL6025_REG_LDO6        55
-#define TWL6025_REG_LDOLN       56
-#define TWL6025_REG_LDOUSB      57
+#define TWL6032_REG_LDO2        49
+#define TWL6032_REG_LDO4        50
+#define TWL6032_REG_LDO3        51
+#define TWL6032_REG_LDO5        52
+#define TWL6032_REG_LDO1        53
+#define TWL6032_REG_LDO7        54
+#define TWL6032_REG_LDO6        55
+#define TWL6032_REG_LDOLN       56
+#define TWL6032_REG_LDOUSB      57
 
 /* 6025 DCDC supplies */
-#define TWL6025_REG_SMPS3       58
-#define TWL6025_REG_SMPS4       59
-#define TWL6025_REG_VIO         60
+#define TWL6032_REG_SMPS3       58
+#define TWL6032_REG_SMPS4       59
+#define TWL6032_REG_VIO         60
 
 
 #endif /* End of __TWL4030_H */