diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/i2c/twl.h | 30 |
1 files changed, 15 insertions, 15 deletions
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 { | |||
725 | struct regulator_init_data *clk32kg; | 725 | struct regulator_init_data *clk32kg; |
726 | struct regulator_init_data *v1v8; | 726 | struct regulator_init_data *v1v8; |
727 | struct regulator_init_data *v2v1; | 727 | struct regulator_init_data *v2v1; |
728 | /* TWL6025 LDO regulators */ | 728 | /* TWL6032 LDO regulators */ |
729 | struct regulator_init_data *ldo1; | 729 | struct regulator_init_data *ldo1; |
730 | struct regulator_init_data *ldo2; | 730 | struct regulator_init_data *ldo2; |
731 | struct regulator_init_data *ldo3; | 731 | struct regulator_init_data *ldo3; |
@@ -735,7 +735,7 @@ struct twl4030_platform_data { | |||
735 | struct regulator_init_data *ldo7; | 735 | struct regulator_init_data *ldo7; |
736 | struct regulator_init_data *ldoln; | 736 | struct regulator_init_data *ldoln; |
737 | struct regulator_init_data *ldousb; | 737 | struct regulator_init_data *ldousb; |
738 | /* TWL6025 DCDC regulators */ | 738 | /* TWL6032 DCDC regulators */ |
739 | struct regulator_init_data *smps3; | 739 | struct regulator_init_data *smps3; |
740 | struct regulator_init_data *smps4; | 740 | struct regulator_init_data *smps4; |
741 | struct regulator_init_data *vio6025; | 741 | struct regulator_init_data *vio6025; |
@@ -752,7 +752,7 @@ struct twl_regulator_driver_data { | |||
752 | #define TPS_SUBSET BIT(1) /* tps659[23]0 have fewer LDOs */ | 752 | #define TPS_SUBSET BIT(1) /* tps659[23]0 have fewer LDOs */ |
753 | #define TWL5031 BIT(2) /* twl5031 has different registers */ | 753 | #define TWL5031 BIT(2) /* twl5031 has different registers */ |
754 | #define TWL6030_CLASS BIT(3) /* TWL6030 class */ | 754 | #define TWL6030_CLASS BIT(3) /* TWL6030 class */ |
755 | #define TWL6025_SUBCLASS BIT(4) /* TWL6025 has changed registers */ | 755 | #define TWL6032_SUBCLASS BIT(4) /* TWL6032 has changed registers */ |
756 | #define TWL4030_ALLOW_UNSUPPORTED BIT(5) /* Some voltages are possible | 756 | #define TWL4030_ALLOW_UNSUPPORTED BIT(5) /* Some voltages are possible |
757 | * but not officially supported. | 757 | * but not officially supported. |
758 | * This flag is necessary to | 758 | * This flag is necessary to |
@@ -839,20 +839,20 @@ static inline int twl4030charger_usb_en(int enable) { return 0; } | |||
839 | #define TWL6030_REG_CLK32KG 48 | 839 | #define TWL6030_REG_CLK32KG 48 |
840 | 840 | ||
841 | /* LDOs on 6025 have different names */ | 841 | /* LDOs on 6025 have different names */ |
842 | #define TWL6025_REG_LDO2 49 | 842 | #define TWL6032_REG_LDO2 49 |
843 | #define TWL6025_REG_LDO4 50 | 843 | #define TWL6032_REG_LDO4 50 |
844 | #define TWL6025_REG_LDO3 51 | 844 | #define TWL6032_REG_LDO3 51 |
845 | #define TWL6025_REG_LDO5 52 | 845 | #define TWL6032_REG_LDO5 52 |
846 | #define TWL6025_REG_LDO1 53 | 846 | #define TWL6032_REG_LDO1 53 |
847 | #define TWL6025_REG_LDO7 54 | 847 | #define TWL6032_REG_LDO7 54 |
848 | #define TWL6025_REG_LDO6 55 | 848 | #define TWL6032_REG_LDO6 55 |
849 | #define TWL6025_REG_LDOLN 56 | 849 | #define TWL6032_REG_LDOLN 56 |
850 | #define TWL6025_REG_LDOUSB 57 | 850 | #define TWL6032_REG_LDOUSB 57 |
851 | 851 | ||
852 | /* 6025 DCDC supplies */ | 852 | /* 6025 DCDC supplies */ |
853 | #define TWL6025_REG_SMPS3 58 | 853 | #define TWL6032_REG_SMPS3 58 |
854 | #define TWL6025_REG_SMPS4 59 | 854 | #define TWL6032_REG_SMPS4 59 |
855 | #define TWL6025_REG_VIO 60 | 855 | #define TWL6032_REG_VIO 60 |
856 | 856 | ||
857 | 857 | ||
858 | #endif /* End of __TWL4030_H */ | 858 | #endif /* End of __TWL4030_H */ |