tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

regulator: TWL: Remove entry of RES_ID for 6030 macros

RES_ID is only used in 4030, to send PBM singular message to control
the state of dedicated resources. In 6030, we don't have concept of PBM,
hence removing the definition of RES_ID (num) from macros.

Signed-off-by: Ambresh K <ambresh@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>

authored by

Ambresh K and committed by
Liam Girdwood af8b244f 909c2f32

+29 -33
+29 -33
drivers/regulator/twl-regulator.c
··· 835 835 remap_conf) \ 836 836 TWL_FIXED_LDO(label, offset, mVolts, num, turnon_delay, \ 837 837 remap_conf, TWL4030, twl4030fixed_ops) 838 - #define TWL6030_FIXED_LDO(label, offset, mVolts, num, turnon_delay) \ 839 - TWL_FIXED_LDO(label, offset, mVolts, num, turnon_delay, \ 838 + #define TWL6030_FIXED_LDO(label, offset, mVolts, turnon_delay) \ 839 + TWL_FIXED_LDO(label, offset, mVolts, 0x0, turnon_delay, \ 840 840 0x0, TWL6030, twl6030fixed_ops) 841 841 842 842 #define TWL4030_ADJUSTABLE_LDO(label, offset, num, turnon_delay, remap_conf) { \ ··· 856 856 }, \ 857 857 } 858 858 859 - #define TWL6030_ADJUSTABLE_LDO(label, offset, min_mVolts, max_mVolts, num) { \ 859 + #define TWL6030_ADJUSTABLE_LDO(label, offset, min_mVolts, max_mVolts) { \ 860 860 .base = offset, \ 861 - .id = num, \ 862 861 .min_mV = min_mVolts, \ 863 862 .max_mV = max_mVolts, \ 864 863 .desc = { \ ··· 870 871 }, \ 871 872 } 872 873 873 - #define TWL6025_ADJUSTABLE_LDO(label, offset, min_mVolts, max_mVolts, num) { \ 874 + #define TWL6025_ADJUSTABLE_LDO(label, offset, min_mVolts, max_mVolts) { \ 874 875 .base = offset, \ 875 - .id = num, \ 876 876 .min_mV = min_mVolts, \ 877 877 .max_mV = max_mVolts, \ 878 878 .desc = { \ ··· 901 903 }, \ 902 904 } 903 905 904 - #define TWL6030_FIXED_RESOURCE(label, offset, num, turnon_delay) { \ 906 + #define TWL6030_FIXED_RESOURCE(label, offset, turnon_delay) { \ 905 907 .base = offset, \ 906 - .id = num, \ 907 908 .delay = turnon_delay, \ 908 909 .desc = { \ 909 910 .name = #label, \ ··· 913 916 }, \ 914 917 } 915 918 916 - #define TWL6025_ADJUSTABLE_SMPS(label, offset, num) { \ 919 + #define TWL6025_ADJUSTABLE_SMPS(label, offset) { \ 917 920 .base = offset, \ 918 - .id = num, \ 919 921 .min_mV = 600, \ 920 922 .max_mV = 2100, \ 921 923 .desc = { \ ··· 957 961 /* 6030 REG with base as PMC Slave Misc : 0x0030 */ 958 962 /* Turnon-delay and remap configuration values for 6030 are not 959 963 verified since the specification is not public */ 960 - TWL6030_ADJUSTABLE_LDO(VAUX1_6030, 0x54, 1000, 3300, 1), 961 - TWL6030_ADJUSTABLE_LDO(VAUX2_6030, 0x58, 1000, 3300, 2), 962 - TWL6030_ADJUSTABLE_LDO(VAUX3_6030, 0x5c, 1000, 3300, 3), 963 - TWL6030_ADJUSTABLE_LDO(VMMC, 0x68, 1000, 3300, 4), 964 - TWL6030_ADJUSTABLE_LDO(VPP, 0x6c, 1000, 3300, 5), 965 - TWL6030_ADJUSTABLE_LDO(VUSIM, 0x74, 1000, 3300, 7), 966 - TWL6030_FIXED_LDO(VANA, 0x50, 2100, 15, 0), 967 - TWL6030_FIXED_LDO(VCXIO, 0x60, 1800, 16, 0), 968 - TWL6030_FIXED_LDO(VDAC, 0x64, 1800, 17, 0), 969 - TWL6030_FIXED_LDO(VUSB, 0x70, 3300, 18, 0), 970 - TWL6030_FIXED_RESOURCE(CLK32KG, 0x8C, 48, 0), 964 + TWL6030_ADJUSTABLE_LDO(VAUX1_6030, 0x54, 1000, 3300), 965 + TWL6030_ADJUSTABLE_LDO(VAUX2_6030, 0x58, 1000, 3300), 966 + TWL6030_ADJUSTABLE_LDO(VAUX3_6030, 0x5c, 1000, 3300), 967 + TWL6030_ADJUSTABLE_LDO(VMMC, 0x68, 1000, 3300), 968 + TWL6030_ADJUSTABLE_LDO(VPP, 0x6c, 1000, 3300), 969 + TWL6030_ADJUSTABLE_LDO(VUSIM, 0x74, 1000, 3300), 970 + TWL6030_FIXED_LDO(VANA, 0x50, 2100, 0), 971 + TWL6030_FIXED_LDO(VCXIO, 0x60, 1800, 0), 972 + TWL6030_FIXED_LDO(VDAC, 0x64, 1800, 0), 973 + TWL6030_FIXED_LDO(VUSB, 0x70, 3300, 0), 974 + TWL6030_FIXED_RESOURCE(CLK32KG, 0x8C, 0), 971 975 972 976 /* 6025 are renamed compared to 6030 versions */ 973 - TWL6025_ADJUSTABLE_LDO(LDO2, 0x54, 1000, 3300, 1), 974 - TWL6025_ADJUSTABLE_LDO(LDO4, 0x58, 1000, 3300, 2), 975 - TWL6025_ADJUSTABLE_LDO(LDO3, 0x5c, 1000, 3300, 3), 976 - TWL6025_ADJUSTABLE_LDO(LDO5, 0x68, 1000, 3300, 4), 977 - TWL6025_ADJUSTABLE_LDO(LDO1, 0x6c, 1000, 3300, 5), 978 - TWL6025_ADJUSTABLE_LDO(LDO7, 0x74, 1000, 3300, 7), 979 - TWL6025_ADJUSTABLE_LDO(LDO6, 0x60, 1000, 3300, 16), 980 - TWL6025_ADJUSTABLE_LDO(LDOLN, 0x64, 1000, 3300, 17), 981 - TWL6025_ADJUSTABLE_LDO(LDOUSB, 0x70, 1000, 3300, 18), 977 + TWL6025_ADJUSTABLE_LDO(LDO2, 0x54, 1000, 3300), 978 + TWL6025_ADJUSTABLE_LDO(LDO4, 0x58, 1000, 3300), 979 + TWL6025_ADJUSTABLE_LDO(LDO3, 0x5c, 1000, 3300), 980 + TWL6025_ADJUSTABLE_LDO(LDO5, 0x68, 1000, 3300), 981 + TWL6025_ADJUSTABLE_LDO(LDO1, 0x6c, 1000, 3300), 982 + TWL6025_ADJUSTABLE_LDO(LDO7, 0x74, 1000, 3300), 983 + TWL6025_ADJUSTABLE_LDO(LDO6, 0x60, 1000, 3300), 984 + TWL6025_ADJUSTABLE_LDO(LDOLN, 0x64, 1000, 3300), 985 + TWL6025_ADJUSTABLE_LDO(LDOUSB, 0x70, 1000, 3300), 982 986 983 - TWL6025_ADJUSTABLE_SMPS(SMPS3, 0x34, 1), 984 - TWL6025_ADJUSTABLE_SMPS(SMPS4, 0x10, 2), 985 - TWL6025_ADJUSTABLE_SMPS(VIO, 0x16, 3), 987 + TWL6025_ADJUSTABLE_SMPS(SMPS3, 0x34), 988 + TWL6025_ADJUSTABLE_SMPS(SMPS4, 0x10), 989 + TWL6025_ADJUSTABLE_SMPS(VIO, 0x16), 986 990 }; 987 991 988 992 static u8 twl_get_smps_offset(void)