diff options
author | Lee Jones <lee.jones@linaro.org> | 2013-03-28 12:11:18 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-01 08:23:39 -0400 |
commit | 62ab4111113cf0d54c2b264730533fb53a04cc30 (patch) | |
tree | 32248737a2cee93833472b1db4fe20997d5e1a75 /drivers/regulator/ab8500.c | |
parent | b080c78a4e447e9c212c207f725999d4e32c5f19 (diff) |
regulator: ab8500: Use regulator_list_voltage_table()
Following a recent move to regulator_list_voltage_table() for
all previous abx500 related platforms this converts all recent
platform updates over too.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/ab8500.c')
-rw-r--r-- | drivers/regulator/ab8500.c | 62 |
1 files changed, 22 insertions, 40 deletions
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index bade3e2a510d..16f5cf7ec13b 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c | |||
@@ -96,7 +96,7 @@ static const unsigned int ldo_vaux3_voltages[] = { | |||
96 | 2910000, | 96 | 2910000, |
97 | }; | 97 | }; |
98 | 98 | ||
99 | static const int ldo_vaux56_voltages[] = { | 99 | static const unsigned int ldo_vaux56_voltages[] = { |
100 | 1800000, | 100 | 1800000, |
101 | 1050000, | 101 | 1050000, |
102 | 1100000, | 102 | 1100000, |
@@ -107,7 +107,7 @@ static const int ldo_vaux56_voltages[] = { | |||
107 | 2790000, | 107 | 2790000, |
108 | }; | 108 | }; |
109 | 109 | ||
110 | static const int ldo_vaux3_ab8540_voltages[] = { | 110 | static const unsigned int ldo_vaux3_ab8540_voltages[] = { |
111 | 1200000, | 111 | 1200000, |
112 | 1500000, | 112 | 1500000, |
113 | 1800000, | 113 | 1800000, |
@@ -129,7 +129,7 @@ static const unsigned int ldo_vintcore_voltages[] = { | |||
129 | 1350000, | 129 | 1350000, |
130 | }; | 130 | }; |
131 | 131 | ||
132 | static const int ldo_sdio_voltages[] = { | 132 | static const unsigned int ldo_sdio_voltages[] = { |
133 | 1160000, | 133 | 1160000, |
134 | 1050000, | 134 | 1050000, |
135 | 1100000, | 135 | 1100000, |
@@ -662,6 +662,7 @@ static struct ab8500_regulator_info | |||
662 | .id = AB8500_LDO_AUX1, | 662 | .id = AB8500_LDO_AUX1, |
663 | .owner = THIS_MODULE, | 663 | .owner = THIS_MODULE, |
664 | .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), | 664 | .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), |
665 | .volt_table = ldo_vauxn_voltages, | ||
665 | }, | 666 | }, |
666 | .load_lp_uA = 5000, | 667 | .load_lp_uA = 5000, |
667 | .update_bank = 0x04, | 668 | .update_bank = 0x04, |
@@ -673,8 +674,6 @@ static struct ab8500_regulator_info | |||
673 | .voltage_bank = 0x04, | 674 | .voltage_bank = 0x04, |
674 | .voltage_reg = 0x1f, | 675 | .voltage_reg = 0x1f, |
675 | .voltage_mask = 0x0f, | 676 | .voltage_mask = 0x0f, |
676 | .voltages = ldo_vauxn_voltages, | ||
677 | .voltages_len = ARRAY_SIZE(ldo_vauxn_voltages), | ||
678 | }, | 677 | }, |
679 | [AB8505_LDO_AUX2] = { | 678 | [AB8505_LDO_AUX2] = { |
680 | .desc = { | 679 | .desc = { |
@@ -684,6 +683,7 @@ static struct ab8500_regulator_info | |||
684 | .id = AB8500_LDO_AUX2, | 683 | .id = AB8500_LDO_AUX2, |
685 | .owner = THIS_MODULE, | 684 | .owner = THIS_MODULE, |
686 | .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), | 685 | .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), |
686 | .volt_table = ldo_vauxn_voltages, | ||
687 | }, | 687 | }, |
688 | .load_lp_uA = 5000, | 688 | .load_lp_uA = 5000, |
689 | .update_bank = 0x04, | 689 | .update_bank = 0x04, |
@@ -695,8 +695,6 @@ static struct ab8500_regulator_info | |||
695 | .voltage_bank = 0x04, | 695 | .voltage_bank = 0x04, |
696 | .voltage_reg = 0x20, | 696 | .voltage_reg = 0x20, |
697 | .voltage_mask = 0x0f, | 697 | .voltage_mask = 0x0f, |
698 | .voltages = ldo_vauxn_voltages, | ||
699 | .voltages_len = ARRAY_SIZE(ldo_vauxn_voltages), | ||
700 | }, | 698 | }, |
701 | [AB8505_LDO_AUX3] = { | 699 | [AB8505_LDO_AUX3] = { |
702 | .desc = { | 700 | .desc = { |
@@ -706,6 +704,7 @@ static struct ab8500_regulator_info | |||
706 | .id = AB8500_LDO_AUX3, | 704 | .id = AB8500_LDO_AUX3, |
707 | .owner = THIS_MODULE, | 705 | .owner = THIS_MODULE, |
708 | .n_voltages = ARRAY_SIZE(ldo_vaux3_voltages), | 706 | .n_voltages = ARRAY_SIZE(ldo_vaux3_voltages), |
707 | .volt_table = ldo_vaux3_voltages, | ||
709 | }, | 708 | }, |
710 | .load_lp_uA = 5000, | 709 | .load_lp_uA = 5000, |
711 | .update_bank = 0x04, | 710 | .update_bank = 0x04, |
@@ -717,8 +716,6 @@ static struct ab8500_regulator_info | |||
717 | .voltage_bank = 0x04, | 716 | .voltage_bank = 0x04, |
718 | .voltage_reg = 0x21, | 717 | .voltage_reg = 0x21, |
719 | .voltage_mask = 0x07, | 718 | .voltage_mask = 0x07, |
720 | .voltages = ldo_vaux3_voltages, | ||
721 | .voltages_len = ARRAY_SIZE(ldo_vaux3_voltages), | ||
722 | }, | 719 | }, |
723 | [AB8505_LDO_AUX4] = { | 720 | [AB8505_LDO_AUX4] = { |
724 | .desc = { | 721 | .desc = { |
@@ -728,6 +725,7 @@ static struct ab8500_regulator_info | |||
728 | .id = AB9540_LDO_AUX4, | 725 | .id = AB9540_LDO_AUX4, |
729 | .owner = THIS_MODULE, | 726 | .owner = THIS_MODULE, |
730 | .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), | 727 | .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), |
728 | .volt_table = ldo_vauxn_voltages, | ||
731 | }, | 729 | }, |
732 | .load_lp_uA = 5000, | 730 | .load_lp_uA = 5000, |
733 | /* values for Vaux4Regu register */ | 731 | /* values for Vaux4Regu register */ |
@@ -741,8 +739,6 @@ static struct ab8500_regulator_info | |||
741 | .voltage_bank = 0x04, | 739 | .voltage_bank = 0x04, |
742 | .voltage_reg = 0x2f, | 740 | .voltage_reg = 0x2f, |
743 | .voltage_mask = 0x0f, | 741 | .voltage_mask = 0x0f, |
744 | .voltages = ldo_vauxn_voltages, | ||
745 | .voltages_len = ARRAY_SIZE(ldo_vauxn_voltages), | ||
746 | }, | 742 | }, |
747 | [AB8505_LDO_AUX5] = { | 743 | [AB8505_LDO_AUX5] = { |
748 | .desc = { | 744 | .desc = { |
@@ -752,6 +748,7 @@ static struct ab8500_regulator_info | |||
752 | .id = AB8505_LDO_AUX5, | 748 | .id = AB8505_LDO_AUX5, |
753 | .owner = THIS_MODULE, | 749 | .owner = THIS_MODULE, |
754 | .n_voltages = ARRAY_SIZE(ldo_vaux56_voltages), | 750 | .n_voltages = ARRAY_SIZE(ldo_vaux56_voltages), |
751 | .volt_table = ldo_vaux56_voltages, | ||
755 | }, | 752 | }, |
756 | .load_lp_uA = 2000, | 753 | .load_lp_uA = 2000, |
757 | /* values for CtrlVaux5 register */ | 754 | /* values for CtrlVaux5 register */ |
@@ -764,8 +761,6 @@ static struct ab8500_regulator_info | |||
764 | .voltage_bank = 0x01, | 761 | .voltage_bank = 0x01, |
765 | .voltage_reg = 0x55, | 762 | .voltage_reg = 0x55, |
766 | .voltage_mask = 0x07, | 763 | .voltage_mask = 0x07, |
767 | .voltages = ldo_vaux56_voltages, | ||
768 | .voltages_len = ARRAY_SIZE(ldo_vaux56_voltages), | ||
769 | }, | 764 | }, |
770 | [AB8505_LDO_AUX6] = { | 765 | [AB8505_LDO_AUX6] = { |
771 | .desc = { | 766 | .desc = { |
@@ -775,6 +770,7 @@ static struct ab8500_regulator_info | |||
775 | .id = AB8505_LDO_AUX6, | 770 | .id = AB8505_LDO_AUX6, |
776 | .owner = THIS_MODULE, | 771 | .owner = THIS_MODULE, |
777 | .n_voltages = ARRAY_SIZE(ldo_vaux56_voltages), | 772 | .n_voltages = ARRAY_SIZE(ldo_vaux56_voltages), |
773 | .volt_table = ldo_vaux56_voltages, | ||
778 | }, | 774 | }, |
779 | .load_lp_uA = 2000, | 775 | .load_lp_uA = 2000, |
780 | /* values for CtrlVaux6 register */ | 776 | /* values for CtrlVaux6 register */ |
@@ -787,8 +783,6 @@ static struct ab8500_regulator_info | |||
787 | .voltage_bank = 0x01, | 783 | .voltage_bank = 0x01, |
788 | .voltage_reg = 0x56, | 784 | .voltage_reg = 0x56, |
789 | .voltage_mask = 0x07, | 785 | .voltage_mask = 0x07, |
790 | .voltages = ldo_vaux56_voltages, | ||
791 | .voltages_len = ARRAY_SIZE(ldo_vaux56_voltages), | ||
792 | }, | 786 | }, |
793 | [AB8505_LDO_INTCORE] = { | 787 | [AB8505_LDO_INTCORE] = { |
794 | .desc = { | 788 | .desc = { |
@@ -798,6 +792,7 @@ static struct ab8500_regulator_info | |||
798 | .id = AB8500_LDO_INTCORE, | 792 | .id = AB8500_LDO_INTCORE, |
799 | .owner = THIS_MODULE, | 793 | .owner = THIS_MODULE, |
800 | .n_voltages = ARRAY_SIZE(ldo_vintcore_voltages), | 794 | .n_voltages = ARRAY_SIZE(ldo_vintcore_voltages), |
795 | .volt_table = ldo_vintcore_voltages, | ||
801 | }, | 796 | }, |
802 | .load_lp_uA = 5000, | 797 | .load_lp_uA = 5000, |
803 | .update_bank = 0x03, | 798 | .update_bank = 0x03, |
@@ -809,8 +804,6 @@ static struct ab8500_regulator_info | |||
809 | .voltage_bank = 0x03, | 804 | .voltage_bank = 0x03, |
810 | .voltage_reg = 0x80, | 805 | .voltage_reg = 0x80, |
811 | .voltage_mask = 0x38, | 806 | .voltage_mask = 0x38, |
812 | .voltages = ldo_vintcore_voltages, | ||
813 | .voltages_len = ARRAY_SIZE(ldo_vintcore_voltages), | ||
814 | .voltage_shift = 3, | 807 | .voltage_shift = 3, |
815 | }, | 808 | }, |
816 | 809 | ||
@@ -955,6 +948,7 @@ static struct ab8500_regulator_info | |||
955 | .id = AB8500_LDO_AUX1, | 948 | .id = AB8500_LDO_AUX1, |
956 | .owner = THIS_MODULE, | 949 | .owner = THIS_MODULE, |
957 | .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), | 950 | .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), |
951 | .volt_table = ldo_vauxn_voltages, | ||
958 | }, | 952 | }, |
959 | .load_lp_uA = 5000, | 953 | .load_lp_uA = 5000, |
960 | .update_bank = 0x04, | 954 | .update_bank = 0x04, |
@@ -966,8 +960,6 @@ static struct ab8500_regulator_info | |||
966 | .voltage_bank = 0x04, | 960 | .voltage_bank = 0x04, |
967 | .voltage_reg = 0x1f, | 961 | .voltage_reg = 0x1f, |
968 | .voltage_mask = 0x0f, | 962 | .voltage_mask = 0x0f, |
969 | .voltages = ldo_vauxn_voltages, | ||
970 | .voltages_len = ARRAY_SIZE(ldo_vauxn_voltages), | ||
971 | }, | 963 | }, |
972 | [AB9540_LDO_AUX2] = { | 964 | [AB9540_LDO_AUX2] = { |
973 | .desc = { | 965 | .desc = { |
@@ -977,6 +969,7 @@ static struct ab8500_regulator_info | |||
977 | .id = AB8500_LDO_AUX2, | 969 | .id = AB8500_LDO_AUX2, |
978 | .owner = THIS_MODULE, | 970 | .owner = THIS_MODULE, |
979 | .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), | 971 | .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), |
972 | .volt_table = ldo_vauxn_voltages, | ||
980 | }, | 973 | }, |
981 | .load_lp_uA = 5000, | 974 | .load_lp_uA = 5000, |
982 | .update_bank = 0x04, | 975 | .update_bank = 0x04, |
@@ -988,8 +981,6 @@ static struct ab8500_regulator_info | |||
988 | .voltage_bank = 0x04, | 981 | .voltage_bank = 0x04, |
989 | .voltage_reg = 0x20, | 982 | .voltage_reg = 0x20, |
990 | .voltage_mask = 0x0f, | 983 | .voltage_mask = 0x0f, |
991 | .voltages = ldo_vauxn_voltages, | ||
992 | .voltages_len = ARRAY_SIZE(ldo_vauxn_voltages), | ||
993 | }, | 984 | }, |
994 | [AB9540_LDO_AUX3] = { | 985 | [AB9540_LDO_AUX3] = { |
995 | .desc = { | 986 | .desc = { |
@@ -999,6 +990,7 @@ static struct ab8500_regulator_info | |||
999 | .id = AB8500_LDO_AUX3, | 990 | .id = AB8500_LDO_AUX3, |
1000 | .owner = THIS_MODULE, | 991 | .owner = THIS_MODULE, |
1001 | .n_voltages = ARRAY_SIZE(ldo_vaux3_voltages), | 992 | .n_voltages = ARRAY_SIZE(ldo_vaux3_voltages), |
993 | .volt_table = ldo_vaux3_voltages, | ||
1002 | }, | 994 | }, |
1003 | .load_lp_uA = 5000, | 995 | .load_lp_uA = 5000, |
1004 | .update_bank = 0x04, | 996 | .update_bank = 0x04, |
@@ -1010,8 +1002,6 @@ static struct ab8500_regulator_info | |||
1010 | .voltage_bank = 0x04, | 1002 | .voltage_bank = 0x04, |
1011 | .voltage_reg = 0x21, | 1003 | .voltage_reg = 0x21, |
1012 | .voltage_mask = 0x07, | 1004 | .voltage_mask = 0x07, |
1013 | .voltages = ldo_vaux3_voltages, | ||
1014 | .voltages_len = ARRAY_SIZE(ldo_vaux3_voltages), | ||
1015 | }, | 1005 | }, |
1016 | [AB9540_LDO_AUX4] = { | 1006 | [AB9540_LDO_AUX4] = { |
1017 | .desc = { | 1007 | .desc = { |
@@ -1021,6 +1011,7 @@ static struct ab8500_regulator_info | |||
1021 | .id = AB9540_LDO_AUX4, | 1011 | .id = AB9540_LDO_AUX4, |
1022 | .owner = THIS_MODULE, | 1012 | .owner = THIS_MODULE, |
1023 | .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), | 1013 | .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), |
1014 | .volt_table = ldo_vauxn_voltages, | ||
1024 | }, | 1015 | }, |
1025 | .load_lp_uA = 5000, | 1016 | .load_lp_uA = 5000, |
1026 | /* values for Vaux4Regu register */ | 1017 | /* values for Vaux4Regu register */ |
@@ -1034,8 +1025,6 @@ static struct ab8500_regulator_info | |||
1034 | .voltage_bank = 0x04, | 1025 | .voltage_bank = 0x04, |
1035 | .voltage_reg = 0x2f, | 1026 | .voltage_reg = 0x2f, |
1036 | .voltage_mask = 0x0f, | 1027 | .voltage_mask = 0x0f, |
1037 | .voltages = ldo_vauxn_voltages, | ||
1038 | .voltages_len = ARRAY_SIZE(ldo_vauxn_voltages), | ||
1039 | }, | 1028 | }, |
1040 | [AB9540_LDO_INTCORE] = { | 1029 | [AB9540_LDO_INTCORE] = { |
1041 | .desc = { | 1030 | .desc = { |
@@ -1045,6 +1034,7 @@ static struct ab8500_regulator_info | |||
1045 | .id = AB8500_LDO_INTCORE, | 1034 | .id = AB8500_LDO_INTCORE, |
1046 | .owner = THIS_MODULE, | 1035 | .owner = THIS_MODULE, |
1047 | .n_voltages = ARRAY_SIZE(ldo_vintcore_voltages), | 1036 | .n_voltages = ARRAY_SIZE(ldo_vintcore_voltages), |
1037 | .volt_table = ldo_vintcore_voltages, | ||
1048 | }, | 1038 | }, |
1049 | .load_lp_uA = 5000, | 1039 | .load_lp_uA = 5000, |
1050 | .update_bank = 0x03, | 1040 | .update_bank = 0x03, |
@@ -1056,8 +1046,6 @@ static struct ab8500_regulator_info | |||
1056 | .voltage_bank = 0x03, | 1046 | .voltage_bank = 0x03, |
1057 | .voltage_reg = 0x80, | 1047 | .voltage_reg = 0x80, |
1058 | .voltage_mask = 0x38, | 1048 | .voltage_mask = 0x38, |
1059 | .voltages = ldo_vintcore_voltages, | ||
1060 | .voltages_len = ARRAY_SIZE(ldo_vintcore_voltages), | ||
1061 | .voltage_shift = 3, | 1049 | .voltage_shift = 3, |
1062 | }, | 1050 | }, |
1063 | 1051 | ||
@@ -1203,6 +1191,7 @@ static struct ab8500_regulator_info | |||
1203 | .id = AB8500_LDO_AUX1, | 1191 | .id = AB8500_LDO_AUX1, |
1204 | .owner = THIS_MODULE, | 1192 | .owner = THIS_MODULE, |
1205 | .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), | 1193 | .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), |
1194 | .volt_table = ldo_vauxn_voltages, | ||
1206 | }, | 1195 | }, |
1207 | .load_lp_uA = 5000, | 1196 | .load_lp_uA = 5000, |
1208 | .update_bank = 0x04, | 1197 | .update_bank = 0x04, |
@@ -1214,8 +1203,6 @@ static struct ab8500_regulator_info | |||
1214 | .voltage_bank = 0x04, | 1203 | .voltage_bank = 0x04, |
1215 | .voltage_reg = 0x1f, | 1204 | .voltage_reg = 0x1f, |
1216 | .voltage_mask = 0x0f, | 1205 | .voltage_mask = 0x0f, |
1217 | .voltages = ldo_vauxn_voltages, | ||
1218 | .voltages_len = ARRAY_SIZE(ldo_vauxn_voltages), | ||
1219 | }, | 1206 | }, |
1220 | [AB8540_LDO_AUX2] = { | 1207 | [AB8540_LDO_AUX2] = { |
1221 | .desc = { | 1208 | .desc = { |
@@ -1225,6 +1212,7 @@ static struct ab8500_regulator_info | |||
1225 | .id = AB8500_LDO_AUX2, | 1212 | .id = AB8500_LDO_AUX2, |
1226 | .owner = THIS_MODULE, | 1213 | .owner = THIS_MODULE, |
1227 | .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), | 1214 | .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), |
1215 | .volt_table = ldo_vauxn_voltages, | ||
1228 | }, | 1216 | }, |
1229 | .load_lp_uA = 5000, | 1217 | .load_lp_uA = 5000, |
1230 | .update_bank = 0x04, | 1218 | .update_bank = 0x04, |
@@ -1236,8 +1224,6 @@ static struct ab8500_regulator_info | |||
1236 | .voltage_bank = 0x04, | 1224 | .voltage_bank = 0x04, |
1237 | .voltage_reg = 0x20, | 1225 | .voltage_reg = 0x20, |
1238 | .voltage_mask = 0x0f, | 1226 | .voltage_mask = 0x0f, |
1239 | .voltages = ldo_vauxn_voltages, | ||
1240 | .voltages_len = ARRAY_SIZE(ldo_vauxn_voltages), | ||
1241 | }, | 1227 | }, |
1242 | [AB8540_LDO_AUX3] = { | 1228 | [AB8540_LDO_AUX3] = { |
1243 | .desc = { | 1229 | .desc = { |
@@ -1247,6 +1233,7 @@ static struct ab8500_regulator_info | |||
1247 | .id = AB8500_LDO_AUX3, | 1233 | .id = AB8500_LDO_AUX3, |
1248 | .owner = THIS_MODULE, | 1234 | .owner = THIS_MODULE, |
1249 | .n_voltages = ARRAY_SIZE(ldo_vaux3_ab8540_voltages), | 1235 | .n_voltages = ARRAY_SIZE(ldo_vaux3_ab8540_voltages), |
1236 | .volt_table = ldo_vaux3_ab8540_voltages, | ||
1250 | }, | 1237 | }, |
1251 | .load_lp_uA = 5000, | 1238 | .load_lp_uA = 5000, |
1252 | .update_bank = 0x04, | 1239 | .update_bank = 0x04, |
@@ -1258,8 +1245,6 @@ static struct ab8500_regulator_info | |||
1258 | .voltage_bank = 0x04, | 1245 | .voltage_bank = 0x04, |
1259 | .voltage_reg = 0x21, | 1246 | .voltage_reg = 0x21, |
1260 | .voltage_mask = 0x07, | 1247 | .voltage_mask = 0x07, |
1261 | .voltages = ldo_vaux3_ab8540_voltages, | ||
1262 | .voltages_len = ARRAY_SIZE(ldo_vaux3_ab8540_voltages), | ||
1263 | }, | 1248 | }, |
1264 | [AB8540_LDO_AUX4] = { | 1249 | [AB8540_LDO_AUX4] = { |
1265 | .desc = { | 1250 | .desc = { |
@@ -1269,6 +1254,7 @@ static struct ab8500_regulator_info | |||
1269 | .id = AB9540_LDO_AUX4, | 1254 | .id = AB9540_LDO_AUX4, |
1270 | .owner = THIS_MODULE, | 1255 | .owner = THIS_MODULE, |
1271 | .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), | 1256 | .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), |
1257 | .volt_table = ldo_vauxn_voltages, | ||
1272 | }, | 1258 | }, |
1273 | .load_lp_uA = 5000, | 1259 | .load_lp_uA = 5000, |
1274 | /* values for Vaux4Regu register */ | 1260 | /* values for Vaux4Regu register */ |
@@ -1282,8 +1268,6 @@ static struct ab8500_regulator_info | |||
1282 | .voltage_bank = 0x04, | 1268 | .voltage_bank = 0x04, |
1283 | .voltage_reg = 0x2f, | 1269 | .voltage_reg = 0x2f, |
1284 | .voltage_mask = 0x0f, | 1270 | .voltage_mask = 0x0f, |
1285 | .voltages = ldo_vauxn_voltages, | ||
1286 | .voltages_len = ARRAY_SIZE(ldo_vauxn_voltages), | ||
1287 | }, | 1271 | }, |
1288 | [AB8540_LDO_INTCORE] = { | 1272 | [AB8540_LDO_INTCORE] = { |
1289 | .desc = { | 1273 | .desc = { |
@@ -1293,6 +1277,7 @@ static struct ab8500_regulator_info | |||
1293 | .id = AB8500_LDO_INTCORE, | 1277 | .id = AB8500_LDO_INTCORE, |
1294 | .owner = THIS_MODULE, | 1278 | .owner = THIS_MODULE, |
1295 | .n_voltages = ARRAY_SIZE(ldo_vintcore_voltages), | 1279 | .n_voltages = ARRAY_SIZE(ldo_vintcore_voltages), |
1280 | .volt_table = ldo_vintcore_voltages, | ||
1296 | }, | 1281 | }, |
1297 | .load_lp_uA = 5000, | 1282 | .load_lp_uA = 5000, |
1298 | .update_bank = 0x03, | 1283 | .update_bank = 0x03, |
@@ -1304,8 +1289,6 @@ static struct ab8500_regulator_info | |||
1304 | .voltage_bank = 0x03, | 1289 | .voltage_bank = 0x03, |
1305 | .voltage_reg = 0x80, | 1290 | .voltage_reg = 0x80, |
1306 | .voltage_mask = 0x38, | 1291 | .voltage_mask = 0x38, |
1307 | .voltages = ldo_vintcore_voltages, | ||
1308 | .voltages_len = ARRAY_SIZE(ldo_vintcore_voltages), | ||
1309 | .voltage_shift = 3, | 1292 | .voltage_shift = 3, |
1310 | }, | 1293 | }, |
1311 | 1294 | ||
@@ -1420,7 +1403,8 @@ static struct ab8500_regulator_info | |||
1420 | .type = REGULATOR_VOLTAGE, | 1403 | .type = REGULATOR_VOLTAGE, |
1421 | .id = AB8540_LDO_SDIO, | 1404 | .id = AB8540_LDO_SDIO, |
1422 | .owner = THIS_MODULE, | 1405 | .owner = THIS_MODULE, |
1423 | .n_voltages = ARRAY_SIZE(ldo_sdio_voltages), | 1406 | .n_voltages = ARRAY_SIZE(ldo_sdio_voltages), |
1407 | .volt_table = ldo_sdio_voltages, | ||
1424 | }, | 1408 | }, |
1425 | .load_lp_uA = 5000, | 1409 | .load_lp_uA = 5000, |
1426 | .update_bank = 0x03, | 1410 | .update_bank = 0x03, |
@@ -1432,8 +1416,6 @@ static struct ab8500_regulator_info | |||
1432 | .voltage_bank = 0x03, | 1416 | .voltage_bank = 0x03, |
1433 | .voltage_reg = 0x88, | 1417 | .voltage_reg = 0x88, |
1434 | .voltage_mask = 0x07, | 1418 | .voltage_mask = 0x07, |
1435 | .voltages = ldo_sdio_voltages, | ||
1436 | .voltages_len = ARRAY_SIZE(ldo_sdio_voltages), | ||
1437 | }, | 1419 | }, |
1438 | }; | 1420 | }; |
1439 | 1421 | ||