Merge tag 'xtensa-next-20130710' of git://github.com/czankel/xtensa-linux

[cascardo/linux.git] / include / linux / i2c / twl.h

diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index 488debb..81cbbdb 100644 (file)
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -658,7 +658,6 @@ struct twl4030_power_data {
        bool use_poweroff;      /* Board is wired for TWL poweroff */
 };
 
-extern void twl4030_power_init(struct twl4030_power_data *triton2_scripts);
 extern int twl4030_remove_script(u8 flags);
 extern void twl4030_power_off(void);
 
@@ -726,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;
@@ -736,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;
@@ -753,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
@@ -840,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 */