mfd: twl-core: Change TWL6025 references to TWL6032

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

The TWL6025 was never released beyond sample form and was replaced by
the PhoenixLite range of chips - TWL6032. Change the references to
reference the TWL6032 class and name the registers to twl6032 in line with
an actual released chip name to avoid confusion.

Currently there are no users of TWL6025 in the code.

Signed-off-by: Graeme Gregory <gg@slimlogic.co.uk>
Signed-off-by: Oleksandr Kozaruk <oleksandr.kozaruk@ti.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Reviwed-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

authored by

Graeme Gregory and committed by

Samuel Ortiz 12 years ago 89ce43fb 99717470

+91 -91

6 changed files

expand all

Documentation

devicetree

bindings

regulator

twl-regulator.txt

usb

twlxxxx-usb.txt

drivers

mfd

twl-core.c

regulator

twl-regulator.c

usb

phy

phy-twl6030-usb.c

include

linux

i2c

twl.h

+13 -13

Documentation/devicetree/bindings/regulator/twl-regulator.txt

··· 18 18 - "ti,twl6030-vdd1" for VDD1 SMPS 19 19 - "ti,twl6030-vdd2" for VDD2 SMPS 20 20 - "ti,twl6030-vdd3" for VDD3 SMPS 21 - For twl6025 regulators/LDOs 21 + For twl6032 regulators/LDOs 22 22 - compatible: 23 - - "ti,twl6025-ldo1" for LDO1 LDO 24 - - "ti,twl6025-ldo2" for LDO2 LDO 25 - - "ti,twl6025-ldo3" for LDO3 LDO 26 - - "ti,twl6025-ldo4" for LDO4 LDO 27 - - "ti,twl6025-ldo5" for LDO5 LDO 28 - - "ti,twl6025-ldo6" for LDO6 LDO 29 - - "ti,twl6025-ldo7" for LDO7 LDO 30 - - "ti,twl6025-ldoln" for LDOLN LDO 31 - - "ti,twl6025-ldousb" for LDOUSB LDO 32 - - "ti,twl6025-smps3" for SMPS3 SMPS 33 - - "ti,twl6025-smps4" for SMPS4 SMPS 34 - - "ti,twl6025-vio" for VIO SMPS 23 + - "ti,twl6032-ldo1" for LDO1 LDO 24 + - "ti,twl6032-ldo2" for LDO2 LDO 25 + - "ti,twl6032-ldo3" for LDO3 LDO 26 + - "ti,twl6032-ldo4" for LDO4 LDO 27 + - "ti,twl6032-ldo5" for LDO5 LDO 28 + - "ti,twl6032-ldo6" for LDO6 LDO 29 + - "ti,twl6032-ldo7" for LDO7 LDO 30 + - "ti,twl6032-ldoln" for LDOLN LDO 31 + - "ti,twl6032-ldousb" for LDOUSB LDO 32 + - "ti,twl6032-smps3" for SMPS3 SMPS 33 + - "ti,twl6032-smps4" for SMPS4 SMPS 34 + - "ti,twl6032-vio" for VIO SMPS 35 35 For twl4030 regulators/LDOs 36 36 - compatible: 37 37 - "ti,twl4030-vaux1" for VAUX1 LDO

+1 -1

Documentation/devicetree/bindings/usb/twlxxxx-usb.txt

··· 8 8 usb interrupt number that raises VBUS interrupts when the controller has to 9 9 act as device 10 10 - usb-supply : phandle to the regulator device tree node. It should be vusb 11 - if it is twl6030 or ldousb if it is twl6025 subclass. 11 + if it is twl6030 or ldousb if it is twl6032 subclass. 12 12 13 13 twl6030-usb { 14 14 compatible = "ti,twl6030-usb";

+23 -23

drivers/mfd/twl-core.c

··· 118 118 #define TWL6030_BASEADD_GASGAUGE 0x00C0 119 119 #define TWL6030_BASEADD_PIH 0x00D0 120 120 #define TWL6030_BASEADD_CHARGER 0x00E0 121 - #define TWL6025_BASEADD_CHARGER 0x00DA 121 + #define TWL6032_BASEADD_CHARGER 0x00DA 122 122 #define TWL6030_BASEADD_LED 0x00F4 123 123 124 124 /* subchip/slave 2 0x4A - DFT */ ··· 718 718 | REGULATOR_CHANGE_STATUS, 719 719 }; 720 720 721 - if (features & TWL6025_SUBCLASS) { 721 + if (features & TWL6032_SUBCLASS) { 722 722 usb3v3.supply = "ldousb"; 723 - regulator = TWL6025_REG_LDOUSB; 723 + regulator = TWL6032_REG_LDOUSB; 724 724 } else { 725 725 usb3v3.supply = "vusb"; 726 726 regulator = TWL6030_REG_VUSB; ··· 747 747 usb3v3.dev_name = dev_name(child); 748 748 } else if (IS_ENABLED(CONFIG_REGULATOR_TWL4030) && 749 749 twl_class_is_6030()) { 750 - if (features & TWL6025_SUBCLASS) 751 - child = add_regulator(TWL6025_REG_LDOUSB, 750 + if (features & TWL6032_SUBCLASS) 751 + child = add_regulator(TWL6032_REG_LDOUSB, 752 752 pdata->ldousb, features); 753 753 else 754 754 child = add_regulator(TWL6030_REG_VUSB, ··· 872 872 873 873 /* twl6030 regulators */ 874 874 if (IS_ENABLED(CONFIG_REGULATOR_TWL4030) && twl_class_is_6030() && 875 - !(features & TWL6025_SUBCLASS)) { 875 + !(features & TWL6032_SUBCLASS)) { 876 876 child = add_regulator(TWL6030_REG_VDD1, pdata->vdd1, 877 877 features); 878 878 if (IS_ERR(child)) ··· 952 952 return PTR_ERR(child); 953 953 } 954 954 955 - /* twl6025 regulators */ 955 + /* twl6032 regulators */ 956 956 if (IS_ENABLED(CONFIG_REGULATOR_TWL4030) && twl_class_is_6030() && 957 - (features & TWL6025_SUBCLASS)) { 958 - child = add_regulator(TWL6025_REG_LDO5, pdata->ldo5, 957 + (features & TWL6032_SUBCLASS)) { 958 + child = add_regulator(TWL6032_REG_LDO5, pdata->ldo5, 959 959 features); 960 960 if (IS_ERR(child)) 961 961 return PTR_ERR(child); 962 962 963 - child = add_regulator(TWL6025_REG_LDO1, pdata->ldo1, 963 + child = add_regulator(TWL6032_REG_LDO1, pdata->ldo1, 964 964 features); 965 965 if (IS_ERR(child)) 966 966 return PTR_ERR(child); 967 967 968 - child = add_regulator(TWL6025_REG_LDO7, pdata->ldo7, 968 + child = add_regulator(TWL6032_REG_LDO7, pdata->ldo7, 969 969 features); 970 970 if (IS_ERR(child)) 971 971 return PTR_ERR(child); 972 972 973 - child = add_regulator(TWL6025_REG_LDO6, pdata->ldo6, 973 + child = add_regulator(TWL6032_REG_LDO6, pdata->ldo6, 974 974 features); 975 975 if (IS_ERR(child)) 976 976 return PTR_ERR(child); 977 977 978 - child = add_regulator(TWL6025_REG_LDOLN, pdata->ldoln, 978 + child = add_regulator(TWL6032_REG_LDOLN, pdata->ldoln, 979 979 features); 980 980 if (IS_ERR(child)) 981 981 return PTR_ERR(child); 982 982 983 - child = add_regulator(TWL6025_REG_LDO2, pdata->ldo2, 983 + child = add_regulator(TWL6032_REG_LDO2, pdata->ldo2, 984 984 features); 985 985 if (IS_ERR(child)) 986 986 return PTR_ERR(child); 987 987 988 - child = add_regulator(TWL6025_REG_LDO4, pdata->ldo4, 988 + child = add_regulator(TWL6032_REG_LDO4, pdata->ldo4, 989 989 features); 990 990 if (IS_ERR(child)) 991 991 return PTR_ERR(child); 992 992 993 - child = add_regulator(TWL6025_REG_LDO3, pdata->ldo3, 993 + child = add_regulator(TWL6032_REG_LDO3, pdata->ldo3, 994 994 features); 995 995 if (IS_ERR(child)) 996 996 return PTR_ERR(child); 997 997 998 - child = add_regulator(TWL6025_REG_SMPS3, pdata->smps3, 998 + child = add_regulator(TWL6032_REG_SMPS3, pdata->smps3, 999 999 features); 1000 1000 if (IS_ERR(child)) 1001 1001 return PTR_ERR(child); 1002 1002 1003 - child = add_regulator(TWL6025_REG_SMPS4, pdata->smps4, 1003 + child = add_regulator(TWL6032_REG_SMPS4, pdata->smps4, 1004 1004 features); 1005 1005 if (IS_ERR(child)) 1006 1006 return PTR_ERR(child); 1007 1007 1008 - child = add_regulator(TWL6025_REG_VIO, pdata->vio6025, 1008 + child = add_regulator(TWL6032_REG_VIO, pdata->vio6025, 1009 1009 features); 1010 1010 if (IS_ERR(child)) 1011 1011 return PTR_ERR(child); ··· 1184 1184 if ((id->driver_data) & TWL6030_CLASS) { 1185 1185 twl_priv->twl_id = TWL6030_CLASS_ID; 1186 1186 twl_priv->twl_map = &twl6030_map[0]; 1187 - /* The charger base address is different in twl6025 */ 1188 - if ((id->driver_data) & TWL6025_SUBCLASS) 1187 + /* The charger base address is different in twl6032 */ 1188 + if ((id->driver_data) & TWL6032_SUBCLASS) 1189 1189 twl_priv->twl_map[TWL_MODULE_MAIN_CHARGE].base = 1190 - TWL6025_BASEADD_CHARGER; 1190 + TWL6032_BASEADD_CHARGER; 1191 1191 twl_regmap_config = twl6030_regmap_config; 1192 1192 } else { 1193 1193 twl_priv->twl_id = TWL4030_CLASS_ID; ··· 1296 1296 { "tps65921", TPS_SUBSET }, /* fewer LDOs; no codec, no LED 1297 1297 and vibrator. Charger in USB module*/ 1298 1298 { "twl6030", TWL6030_CLASS }, /* "Phoenix power chip" */ 1299 - { "twl6025", TWL6030_CLASS | TWL6025_SUBCLASS }, /* "Phoenix lite" */ 1299 + { "twl6032", TWL6030_CLASS | TWL6032_SUBCLASS }, /* "Phoenix lite" */ 1300 1300 { /* end of list */ }, 1301 1301 }; 1302 1302 MODULE_DEVICE_TABLE(i2c, twl_ids);

+38 -38

drivers/regulator/twl-regulator.c

··· 109 109 #define SMPS_OFFSET_EN BIT(0) 110 110 #define SMPS_EXTENDED_EN BIT(1) 111 111 112 - /* twl6025 SMPS EPROM values */ 112 + /* twl6032 SMPS EPROM values */ 113 113 #define TWL6030_SMPS_OFFSET 0xB0 114 114 #define TWL6030_SMPS_MULT 0xB3 115 115 #define SMPS_MULTOFFSET_SMPS4 BIT(0) ··· 173 173 struct twlreg_info *info = rdev_get_drvdata(rdev); 174 174 int grp = 0, val; 175 175 176 - if (!(twl_class_is_6030() && (info->features & TWL6025_SUBCLASS))) { 176 + if (!(twl_class_is_6030() && (info->features & TWL6032_SUBCLASS))) { 177 177 grp = twlreg_grp(rdev); 178 178 if (grp < 0) 179 179 return grp; ··· 211 211 int grp = 0; 212 212 int ret; 213 213 214 - if (!(twl_class_is_6030() && (info->features & TWL6025_SUBCLASS))) 214 + if (!(twl_class_is_6030() && (info->features & TWL6032_SUBCLASS))) 215 215 grp = twlreg_grp(rdev); 216 216 if (grp < 0) 217 217 return grp; ··· 245 245 int grp = 0; 246 246 int ret; 247 247 248 - if (!(twl_class_is_6030() && (info->features & TWL6025_SUBCLASS))) 248 + if (!(twl_class_is_6030() && (info->features & TWL6032_SUBCLASS))) 249 249 grp = P1_GRP_6030 | P2_GRP_6030 | P3_GRP_6030; 250 250 251 251 /* For 6030, set the off state for all grps enabled */ ··· 339 339 int grp = 0; 340 340 int val; 341 341 342 - if (!(twl_class_is_6030() && (info->features & TWL6025_SUBCLASS))) 342 + if (!(twl_class_is_6030() && (info->features & TWL6032_SUBCLASS))) 343 343 grp = twlreg_grp(rdev); 344 344 345 345 if (grp < 0) ··· 899 899 }, \ 900 900 } 901 901 902 - #define TWL6025_ADJUSTABLE_LDO(label, offset, min_mVolts, max_mVolts) \ 903 - static const struct twlreg_info TWL6025_INFO_##label = { \ 902 + #define TWL6032_ADJUSTABLE_LDO(label, offset, min_mVolts, max_mVolts) \ 903 + static const struct twlreg_info TWL6032_INFO_##label = { \ 904 904 .base = offset, \ 905 905 .min_mV = min_mVolts, \ 906 906 .max_mV = max_mVolts, \ 907 907 .desc = { \ 908 908 .name = #label, \ 909 - .id = TWL6025_REG_##label, \ 909 + .id = TWL6032_REG_##label, \ 910 910 .n_voltages = 32, \ 911 911 .ops = &twl6030ldo_ops, \ 912 912 .type = REGULATOR_VOLTAGE, \ ··· 933 933 }, \ 934 934 } 935 935 936 - #define TWL6025_ADJUSTABLE_SMPS(label, offset) \ 936 + #define TWL6032_ADJUSTABLE_SMPS(label, offset) \ 937 937 static const struct twlreg_info TWLSMPS_INFO_##label = { \ 938 938 .base = offset, \ 939 939 .min_mV = 600, \ 940 940 .max_mV = 2100, \ 941 941 .desc = { \ 942 942 .name = #label, \ 943 - .id = TWL6025_REG_##label, \ 943 + .id = TWL6032_REG_##label, \ 944 944 .n_voltages = 63, \ 945 945 .ops = &twlsmps_ops, \ 946 946 .type = REGULATOR_VOLTAGE, \ ··· 981 981 TWL6030_ADJUSTABLE_LDO(VPP, 0x6c, 1000, 3300); 982 982 TWL6030_ADJUSTABLE_LDO(VUSIM, 0x74, 1000, 3300); 983 983 /* 6025 are renamed compared to 6030 versions */ 984 - TWL6025_ADJUSTABLE_LDO(LDO2, 0x54, 1000, 3300); 985 - TWL6025_ADJUSTABLE_LDO(LDO4, 0x58, 1000, 3300); 986 - TWL6025_ADJUSTABLE_LDO(LDO3, 0x5c, 1000, 3300); 987 - TWL6025_ADJUSTABLE_LDO(LDO5, 0x68, 1000, 3300); 988 - TWL6025_ADJUSTABLE_LDO(LDO1, 0x6c, 1000, 3300); 989 - TWL6025_ADJUSTABLE_LDO(LDO7, 0x74, 1000, 3300); 990 - TWL6025_ADJUSTABLE_LDO(LDO6, 0x60, 1000, 3300); 991 - TWL6025_ADJUSTABLE_LDO(LDOLN, 0x64, 1000, 3300); 992 - TWL6025_ADJUSTABLE_LDO(LDOUSB, 0x70, 1000, 3300); 984 + TWL6032_ADJUSTABLE_LDO(LDO2, 0x54, 1000, 3300); 985 + TWL6032_ADJUSTABLE_LDO(LDO4, 0x58, 1000, 3300); 986 + TWL6032_ADJUSTABLE_LDO(LDO3, 0x5c, 1000, 3300); 987 + TWL6032_ADJUSTABLE_LDO(LDO5, 0x68, 1000, 3300); 988 + TWL6032_ADJUSTABLE_LDO(LDO1, 0x6c, 1000, 3300); 989 + TWL6032_ADJUSTABLE_LDO(LDO7, 0x74, 1000, 3300); 990 + TWL6032_ADJUSTABLE_LDO(LDO6, 0x60, 1000, 3300); 991 + TWL6032_ADJUSTABLE_LDO(LDOLN, 0x64, 1000, 3300); 992 + TWL6032_ADJUSTABLE_LDO(LDOUSB, 0x70, 1000, 3300); 993 993 TWL4030_FIXED_LDO(VINTANA1, 0x3f, 1500, 11, 100, 0x08); 994 994 TWL4030_FIXED_LDO(VINTDIG, 0x47, 1500, 13, 100, 0x08); 995 995 TWL4030_FIXED_LDO(VUSB1V5, 0x71, 1500, 17, 100, 0x08); ··· 1001 1001 TWL6030_FIXED_LDO(VUSB, 0x70, 3300, 0); 1002 1002 TWL6030_FIXED_LDO(V1V8, 0x16, 1800, 0); 1003 1003 TWL6030_FIXED_LDO(V2V1, 0x1c, 2100, 0); 1004 - TWL6025_ADJUSTABLE_SMPS(SMPS3, 0x34); 1005 - TWL6025_ADJUSTABLE_SMPS(SMPS4, 0x10); 1006 - TWL6025_ADJUSTABLE_SMPS(VIO, 0x16); 1004 + TWL6032_ADJUSTABLE_SMPS(SMPS3, 0x34); 1005 + TWL6032_ADJUSTABLE_SMPS(SMPS4, 0x10); 1006 + TWL6032_ADJUSTABLE_SMPS(VIO, 0x16); 1007 1007 1008 1008 static u8 twl_get_smps_offset(void) 1009 1009 { ··· 1031 1031 1032 1032 #define TWL4030_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWL4030, label) 1033 1033 #define TWL6030_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWL6030, label) 1034 - #define TWL6025_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWL6025, label) 1034 + #define TWL6032_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWL6032, label) 1035 1035 #define TWLFIXED_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWLFIXED, label) 1036 1036 #define TWLSMPS_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWLSMPS, label) 1037 1037 ··· 1060 1060 TWL6030_OF_MATCH("ti,twl6030-vmmc", VMMC), 1061 1061 TWL6030_OF_MATCH("ti,twl6030-vpp", VPP), 1062 1062 TWL6030_OF_MATCH("ti,twl6030-vusim", VUSIM), 1063 - TWL6025_OF_MATCH("ti,twl6025-ldo2", LDO2), 1064 - TWL6025_OF_MATCH("ti,twl6025-ldo4", LDO4), 1065 - TWL6025_OF_MATCH("ti,twl6025-ldo3", LDO3), 1066 - TWL6025_OF_MATCH("ti,twl6025-ldo5", LDO5), 1067 - TWL6025_OF_MATCH("ti,twl6025-ldo1", LDO1), 1068 - TWL6025_OF_MATCH("ti,twl6025-ldo7", LDO7), 1069 - TWL6025_OF_MATCH("ti,twl6025-ldo6", LDO6), 1070 - TWL6025_OF_MATCH("ti,twl6025-ldoln", LDOLN), 1071 - TWL6025_OF_MATCH("ti,twl6025-ldousb", LDOUSB), 1063 + TWL6032_OF_MATCH("ti,twl6032-ldo2", LDO2), 1064 + TWL6032_OF_MATCH("ti,twl6032-ldo4", LDO4), 1065 + TWL6032_OF_MATCH("ti,twl6032-ldo3", LDO3), 1066 + TWL6032_OF_MATCH("ti,twl6032-ldo5", LDO5), 1067 + TWL6032_OF_MATCH("ti,twl6032-ldo1", LDO1), 1068 + TWL6032_OF_MATCH("ti,twl6032-ldo7", LDO7), 1069 + TWL6032_OF_MATCH("ti,twl6032-ldo6", LDO6), 1070 + TWL6032_OF_MATCH("ti,twl6032-ldoln", LDOLN), 1071 + TWL6032_OF_MATCH("ti,twl6032-ldousb", LDOUSB), 1072 1072 TWLFIXED_OF_MATCH("ti,twl4030-vintana1", VINTANA1), 1073 1073 TWLFIXED_OF_MATCH("ti,twl4030-vintdig", VINTDIG), 1074 1074 TWLFIXED_OF_MATCH("ti,twl4030-vusb1v5", VUSB1V5), ··· 1080 1080 TWLFIXED_OF_MATCH("ti,twl6030-vusb", VUSB), 1081 1081 TWLFIXED_OF_MATCH("ti,twl6030-v1v8", V1V8), 1082 1082 TWLFIXED_OF_MATCH("ti,twl6030-v2v1", V2V1), 1083 - TWLSMPS_OF_MATCH("ti,twl6025-smps3", SMPS3), 1084 - TWLSMPS_OF_MATCH("ti,twl6025-smps4", SMPS4), 1085 - TWLSMPS_OF_MATCH("ti,twl6025-vio", VIO), 1083 + TWLSMPS_OF_MATCH("ti,twl6032-smps3", SMPS3), 1084 + TWLSMPS_OF_MATCH("ti,twl6032-smps4", SMPS4), 1085 + TWLSMPS_OF_MATCH("ti,twl6032-vio", VIO), 1086 1086 {}, 1087 1087 }; 1088 1088 MODULE_DEVICE_TABLE(of, twl_of_match); ··· 1163 1163 } 1164 1164 1165 1165 switch (id) { 1166 - case TWL6025_REG_SMPS3: 1166 + case TWL6032_REG_SMPS3: 1167 1167 if (twl_get_smps_mult() & SMPS_MULTOFFSET_SMPS3) 1168 1168 info->flags |= SMPS_EXTENDED_EN; 1169 1169 if (twl_get_smps_offset() & SMPS_MULTOFFSET_SMPS3) 1170 1170 info->flags |= SMPS_OFFSET_EN; 1171 1171 break; 1172 - case TWL6025_REG_SMPS4: 1172 + case TWL6032_REG_SMPS4: 1173 1173 if (twl_get_smps_mult() & SMPS_MULTOFFSET_SMPS4) 1174 1174 info->flags |= SMPS_EXTENDED_EN; 1175 1175 if (twl_get_smps_offset() & SMPS_MULTOFFSET_SMPS4) 1176 1176 info->flags |= SMPS_OFFSET_EN; 1177 1177 break; 1178 - case TWL6025_REG_VIO: 1178 + case TWL6032_REG_VIO: 1179 1179 if (twl_get_smps_mult() & SMPS_MULTOFFSET_VIO) 1180 1180 info->flags |= SMPS_EXTENDED_EN; 1181 1181 if (twl_get_smps_offset() & SMPS_MULTOFFSET_VIO)

+1 -1

drivers/usb/phy/phy-twl6030-usb.c

··· 347 347 if (np) { 348 348 twl->regulator = "usb"; 349 349 } else if (pdata) { 350 - if (pdata->features & TWL6025_SUBCLASS) 350 + if (pdata->features & TWL6032_SUBCLASS) 351 351 twl->regulator = "ldousb"; 352 352 else 353 353 twl->regulator = "vusb";

+15 -15

include/linux/i2c/twl.h

··· 725 725 struct regulator_init_data *clk32kg; 726 726 struct regulator_init_data *v1v8; 727 727 struct regulator_init_data *v2v1; 728 - /* TWL6025 LDO regulators */ 728 + /* TWL6032 LDO regulators */ 729 729 struct regulator_init_data *ldo1; 730 730 struct regulator_init_data *ldo2; 731 731 struct regulator_init_data *ldo3; ··· 735 735 struct regulator_init_data *ldo7; 736 736 struct regulator_init_data *ldoln; 737 737 struct regulator_init_data *ldousb; 738 - /* TWL6025 DCDC regulators */ 738 + /* TWL6032 DCDC regulators */ 739 739 struct regulator_init_data *smps3; 740 740 struct regulator_init_data *smps4; 741 741 struct regulator_init_data *vio6025; ··· 752 752 #define TPS_SUBSET BIT(1) /* tps659[23]0 have fewer LDOs */ 753 753 #define TWL5031 BIT(2) /* twl5031 has different registers */ 754 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 756 #define TWL4030_ALLOW_UNSUPPORTED BIT(5) /* Some voltages are possible 757 757 * but not officially supported. 758 758 * This flag is necessary to ··· 839 839 #define TWL6030_REG_CLK32KG 48 840 840 841 841 /* LDOs on 6025 have different names */ 842 - #define TWL6025_REG_LDO2 49 843 - #define TWL6025_REG_LDO4 50 844 - #define TWL6025_REG_LDO3 51 845 - #define TWL6025_REG_LDO5 52 846 - #define TWL6025_REG_LDO1 53 847 - #define TWL6025_REG_LDO7 54 848 - #define TWL6025_REG_LDO6 55 849 - #define TWL6025_REG_LDOLN 56 850 - #define TWL6025_REG_LDOUSB 57 842 + #define TWL6032_REG_LDO2 49 843 + #define TWL6032_REG_LDO4 50 844 + #define TWL6032_REG_LDO3 51 845 + #define TWL6032_REG_LDO5 52 846 + #define TWL6032_REG_LDO1 53 847 + #define TWL6032_REG_LDO7 54 848 + #define TWL6032_REG_LDO6 55 849 + #define TWL6032_REG_LDOLN 56 850 + #define TWL6032_REG_LDOUSB 57 851 851 852 852 /* 6025 DCDC supplies */ 853 - #define TWL6025_REG_SMPS3 58 854 - #define TWL6025_REG_SMPS4 59 855 - #define TWL6025_REG_VIO 60 853 + #define TWL6032_REG_SMPS3 58 854 + #define TWL6032_REG_SMPS4 59 855 + #define TWL6032_REG_VIO 60 856 856 857 857 858 858 #endif /* End of __TWL4030_H */