aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator/ab8500.c
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2013-03-28 12:11:17 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-01 08:23:38 -0400
commitb080c78a4e447e9c212c207f725999d4e32c5f19 (patch)
treec0a16fff35fc0f3d4654c875868079b6d965135a /drivers/regulator/ab8500.c
parentae0a9a3efce22e77b5f0f2b266646431f492f7ed (diff)
regulator: ab8500: Update voltage handling for fixed voltage regulators
There are a few over-lapping methods for voltage selection operating in the AB8500 regulator driver currently. This patch removes unused, unnecessary variables from the regulator_info structures and provides voltage tables for those regulators which have fixed voltages. 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.c92
1 files changed, 44 insertions, 48 deletions
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index ec609ab747ae..bade3e2a510d 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -140,6 +140,26 @@ static const int ldo_sdio_voltages[] = {
140 3050000, 140 3050000,
141}; 141};
142 142
143static const unsigned int fixed_1200000_voltage[] = {
144 1200000,
145};
146
147static const unsigned int fixed_1800000_voltage[] = {
148 1800000,
149};
150
151static const unsigned int fixed_2000000_voltage[] = {
152 2000000,
153};
154
155static const unsigned int fixed_2050000_voltage[] = {
156 2050000,
157};
158
159static const unsigned int fixed_3300000_voltage[] = {
160 3300000,
161};
162
143static int ab8500_regulator_enable(struct regulator_dev *rdev) 163static int ab8500_regulator_enable(struct regulator_dev *rdev)
144{ 164{
145 int ret; 165 int ret;
@@ -403,7 +423,6 @@ static struct regulator_ops ab8500_regulator_mode_ops = {
403 .get_optimum_mode = ab8500_regulator_get_optimum_mode, 423 .get_optimum_mode = ab8500_regulator_get_optimum_mode,
404 .set_mode = ab8500_regulator_set_mode, 424 .set_mode = ab8500_regulator_set_mode,
405 .get_mode = ab8500_regulator_get_mode, 425 .get_mode = ab8500_regulator_get_mode,
406 .get_voltage_sel = ab8500_regulator_get_voltage_sel,
407 .list_voltage = regulator_list_voltage_linear, 426 .list_voltage = regulator_list_voltage_linear,
408}; 427};
409 428
@@ -411,7 +430,6 @@ static struct regulator_ops ab8500_regulator_ops = {
411 .enable = ab8500_regulator_enable, 430 .enable = ab8500_regulator_enable,
412 .disable = ab8500_regulator_disable, 431 .disable = ab8500_regulator_disable,
413 .is_enabled = ab8500_regulator_is_enabled, 432 .is_enabled = ab8500_regulator_is_enabled,
414 .get_voltage_sel = ab8500_regulator_get_voltage_sel,
415 .list_voltage = regulator_list_voltage_linear, 433 .list_voltage = regulator_list_voltage_linear,
416}; 434};
417 435
@@ -527,7 +545,7 @@ static struct ab8500_regulator_info
527 .id = AB8500_LDO_TVOUT, 545 .id = AB8500_LDO_TVOUT,
528 .owner = THIS_MODULE, 546 .owner = THIS_MODULE,
529 .n_voltages = 1, 547 .n_voltages = 1,
530 .min_uV = 2000000, 548 .volt_table = fixed_2000000_voltage,
531 .enable_time = 500, 549 .enable_time = 500,
532 }, 550 },
533 .load_lp_uA = 1000, 551 .load_lp_uA = 1000,
@@ -546,8 +564,8 @@ static struct ab8500_regulator_info
546 .id = AB8500_LDO_AUDIO, 564 .id = AB8500_LDO_AUDIO,
547 .owner = THIS_MODULE, 565 .owner = THIS_MODULE,
548 .n_voltages = 1, 566 .n_voltages = 1,
549 .min_uV = 2000000,
550 .enable_time = 140, 567 .enable_time = 140,
568 .volt_table = fixed_2000000_voltage,
551 }, 569 },
552 .update_bank = 0x03, 570 .update_bank = 0x03,
553 .update_reg = 0x83, 571 .update_reg = 0x83,
@@ -562,8 +580,8 @@ static struct ab8500_regulator_info
562 .id = AB8500_LDO_ANAMIC1, 580 .id = AB8500_LDO_ANAMIC1,
563 .owner = THIS_MODULE, 581 .owner = THIS_MODULE,
564 .n_voltages = 1, 582 .n_voltages = 1,
565 .min_uV = 2050000,
566 .enable_time = 500, 583 .enable_time = 500,
584 .volt_table = fixed_2050000_voltage,
567 }, 585 },
568 .update_bank = 0x03, 586 .update_bank = 0x03,
569 .update_reg = 0x83, 587 .update_reg = 0x83,
@@ -578,8 +596,8 @@ static struct ab8500_regulator_info
578 .id = AB8500_LDO_ANAMIC2, 596 .id = AB8500_LDO_ANAMIC2,
579 .owner = THIS_MODULE, 597 .owner = THIS_MODULE,
580 .n_voltages = 1, 598 .n_voltages = 1,
581 .min_uV = 2050000,
582 .enable_time = 500, 599 .enable_time = 500,
600 .volt_table = fixed_2050000_voltage,
583 }, 601 },
584 .update_bank = 0x03, 602 .update_bank = 0x03,
585 .update_reg = 0x83, 603 .update_reg = 0x83,
@@ -594,8 +612,8 @@ static struct ab8500_regulator_info
594 .id = AB8500_LDO_DMIC, 612 .id = AB8500_LDO_DMIC,
595 .owner = THIS_MODULE, 613 .owner = THIS_MODULE,
596 .n_voltages = 1, 614 .n_voltages = 1,
597 .min_uV = 1800000,
598 .enable_time = 420, 615 .enable_time = 420,
616 .volt_table = fixed_1800000_voltage,
599 }, 617 },
600 .update_bank = 0x03, 618 .update_bank = 0x03,
601 .update_reg = 0x83, 619 .update_reg = 0x83,
@@ -614,8 +632,8 @@ static struct ab8500_regulator_info
614 .id = AB8500_LDO_ANA, 632 .id = AB8500_LDO_ANA,
615 .owner = THIS_MODULE, 633 .owner = THIS_MODULE,
616 .n_voltages = 1, 634 .n_voltages = 1,
617 .min_uV = 1200000,
618 .enable_time = 140, 635 .enable_time = 140,
636 .volt_table = fixed_1200000_voltage,
619 }, 637 },
620 .load_lp_uA = 1000, 638 .load_lp_uA = 1000,
621 .update_bank = 0x04, 639 .update_bank = 0x04,
@@ -645,8 +663,6 @@ static struct ab8500_regulator_info
645 .owner = THIS_MODULE, 663 .owner = THIS_MODULE,
646 .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), 664 .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
647 }, 665 },
648 .min_uV = 1100000,
649 .max_uV = 3300000,
650 .load_lp_uA = 5000, 666 .load_lp_uA = 5000,
651 .update_bank = 0x04, 667 .update_bank = 0x04,
652 .update_reg = 0x09, 668 .update_reg = 0x09,
@@ -669,8 +685,6 @@ static struct ab8500_regulator_info
669 .owner = THIS_MODULE, 685 .owner = THIS_MODULE,
670 .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), 686 .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
671 }, 687 },
672 .min_uV = 1100000,
673 .max_uV = 3300000,
674 .load_lp_uA = 5000, 688 .load_lp_uA = 5000,
675 .update_bank = 0x04, 689 .update_bank = 0x04,
676 .update_reg = 0x09, 690 .update_reg = 0x09,
@@ -693,8 +707,6 @@ static struct ab8500_regulator_info
693 .owner = THIS_MODULE, 707 .owner = THIS_MODULE,
694 .n_voltages = ARRAY_SIZE(ldo_vaux3_voltages), 708 .n_voltages = ARRAY_SIZE(ldo_vaux3_voltages),
695 }, 709 },
696 .min_uV = 1100000,
697 .max_uV = 3300000,
698 .load_lp_uA = 5000, 710 .load_lp_uA = 5000,
699 .update_bank = 0x04, 711 .update_bank = 0x04,
700 .update_reg = 0x0a, 712 .update_reg = 0x0a,
@@ -717,8 +729,6 @@ static struct ab8500_regulator_info
717 .owner = THIS_MODULE, 729 .owner = THIS_MODULE,
718 .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), 730 .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
719 }, 731 },
720 .min_uV = 1100000,
721 .max_uV = 3300000,
722 .load_lp_uA = 5000, 732 .load_lp_uA = 5000,
723 /* values for Vaux4Regu register */ 733 /* values for Vaux4Regu register */
724 .update_bank = 0x04, 734 .update_bank = 0x04,
@@ -743,8 +753,6 @@ static struct ab8500_regulator_info
743 .owner = THIS_MODULE, 753 .owner = THIS_MODULE,
744 .n_voltages = ARRAY_SIZE(ldo_vaux56_voltages), 754 .n_voltages = ARRAY_SIZE(ldo_vaux56_voltages),
745 }, 755 },
746 .min_uV = 1050000,
747 .max_uV = 2790000,
748 .load_lp_uA = 2000, 756 .load_lp_uA = 2000,
749 /* values for CtrlVaux5 register */ 757 /* values for CtrlVaux5 register */
750 .update_bank = 0x01, 758 .update_bank = 0x01,
@@ -768,8 +776,6 @@ static struct ab8500_regulator_info
768 .owner = THIS_MODULE, 776 .owner = THIS_MODULE,
769 .n_voltages = ARRAY_SIZE(ldo_vaux56_voltages), 777 .n_voltages = ARRAY_SIZE(ldo_vaux56_voltages),
770 }, 778 },
771 .min_uV = 1050000,
772 .max_uV = 2790000,
773 .load_lp_uA = 2000, 779 .load_lp_uA = 2000,
774 /* values for CtrlVaux6 register */ 780 /* values for CtrlVaux6 register */
775 .update_bank = 0x01, 781 .update_bank = 0x01,
@@ -793,8 +799,6 @@ static struct ab8500_regulator_info
793 .owner = THIS_MODULE, 799 .owner = THIS_MODULE,
794 .n_voltages = ARRAY_SIZE(ldo_vintcore_voltages), 800 .n_voltages = ARRAY_SIZE(ldo_vintcore_voltages),
795 }, 801 },
796 .min_uV = 1100000,
797 .max_uV = 3300000,
798 .load_lp_uA = 5000, 802 .load_lp_uA = 5000,
799 .update_bank = 0x03, 803 .update_bank = 0x03,
800 .update_reg = 0x80, 804 .update_reg = 0x80,
@@ -823,9 +827,9 @@ static struct ab8500_regulator_info
823 .id = AB8505_LDO_ADC, 827 .id = AB8505_LDO_ADC,
824 .owner = THIS_MODULE, 828 .owner = THIS_MODULE,
825 .n_voltages = 1, 829 .n_voltages = 1,
830 .volt_table = fixed_2000000_voltage,
826 }, 831 },
827 .delay = 10000, 832 .delay = 10000,
828 .fixed_uV = 2000000,
829 .load_lp_uA = 1000, 833 .load_lp_uA = 1000,
830 .update_bank = 0x03, 834 .update_bank = 0x03,
831 .update_reg = 0x80, 835 .update_reg = 0x80,
@@ -842,8 +846,8 @@ static struct ab8500_regulator_info
842 .id = AB9540_LDO_USB, 846 .id = AB9540_LDO_USB,
843 .owner = THIS_MODULE, 847 .owner = THIS_MODULE,
844 .n_voltages = 1, 848 .n_voltages = 1,
849 .volt_table = fixed_3300000_voltage,
845 }, 850 },
846 .fixed_uV = 3300000,
847 .update_bank = 0x03, 851 .update_bank = 0x03,
848 .update_reg = 0x82, 852 .update_reg = 0x82,
849 .update_mask = 0x03, 853 .update_mask = 0x03,
@@ -859,8 +863,8 @@ static struct ab8500_regulator_info
859 .id = AB8500_LDO_AUDIO, 863 .id = AB8500_LDO_AUDIO,
860 .owner = THIS_MODULE, 864 .owner = THIS_MODULE,
861 .n_voltages = 1, 865 .n_voltages = 1,
866 .volt_table = fixed_2000000_voltage,
862 }, 867 },
863 .fixed_uV = 2000000,
864 .update_bank = 0x03, 868 .update_bank = 0x03,
865 .update_reg = 0x83, 869 .update_reg = 0x83,
866 .update_mask = 0x02, 870 .update_mask = 0x02,
@@ -874,8 +878,8 @@ static struct ab8500_regulator_info
874 .id = AB8500_LDO_ANAMIC1, 878 .id = AB8500_LDO_ANAMIC1,
875 .owner = THIS_MODULE, 879 .owner = THIS_MODULE,
876 .n_voltages = 1, 880 .n_voltages = 1,
881 .volt_table = fixed_2050000_voltage,
877 }, 882 },
878 .fixed_uV = 2050000,
879 .update_bank = 0x03, 883 .update_bank = 0x03,
880 .update_reg = 0x83, 884 .update_reg = 0x83,
881 .update_mask = 0x08, 885 .update_mask = 0x08,
@@ -889,8 +893,8 @@ static struct ab8500_regulator_info
889 .id = AB8500_LDO_ANAMIC2, 893 .id = AB8500_LDO_ANAMIC2,
890 .owner = THIS_MODULE, 894 .owner = THIS_MODULE,
891 .n_voltages = 1, 895 .n_voltages = 1,
896 .volt_table = fixed_2050000_voltage,
892 }, 897 },
893 .fixed_uV = 2050000,
894 .update_bank = 0x03, 898 .update_bank = 0x03,
895 .update_reg = 0x83, 899 .update_reg = 0x83,
896 .update_mask = 0x10, 900 .update_mask = 0x10,
@@ -904,8 +908,8 @@ static struct ab8500_regulator_info
904 .id = AB8505_LDO_AUX8, 908 .id = AB8505_LDO_AUX8,
905 .owner = THIS_MODULE, 909 .owner = THIS_MODULE,
906 .n_voltages = 1, 910 .n_voltages = 1,
911 .volt_table = fixed_1800000_voltage,
907 }, 912 },
908 .fixed_uV = 1800000,
909 .update_bank = 0x03, 913 .update_bank = 0x03,
910 .update_reg = 0x83, 914 .update_reg = 0x83,
911 .update_mask = 0x04, 915 .update_mask = 0x04,
@@ -922,8 +926,8 @@ static struct ab8500_regulator_info
922 .id = AB8500_LDO_ANA, 926 .id = AB8500_LDO_ANA,
923 .owner = THIS_MODULE, 927 .owner = THIS_MODULE,
924 .n_voltages = 1, 928 .n_voltages = 1,
929 .volt_table = fixed_1200000_voltage,
925 }, 930 },
926 .fixed_uV = 1200000,
927 .load_lp_uA = 1000, 931 .load_lp_uA = 1000,
928 .update_bank = 0x04, 932 .update_bank = 0x04,
929 .update_reg = 0x06, 933 .update_reg = 0x06,
@@ -952,8 +956,6 @@ static struct ab8500_regulator_info
952 .owner = THIS_MODULE, 956 .owner = THIS_MODULE,
953 .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), 957 .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
954 }, 958 },
955 .min_uV = 1100000,
956 .max_uV = 3300000,
957 .load_lp_uA = 5000, 959 .load_lp_uA = 5000,
958 .update_bank = 0x04, 960 .update_bank = 0x04,
959 .update_reg = 0x09, 961 .update_reg = 0x09,
@@ -976,8 +978,6 @@ static struct ab8500_regulator_info
976 .owner = THIS_MODULE, 978 .owner = THIS_MODULE,
977 .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), 979 .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
978 }, 980 },
979 .min_uV = 1100000,
980 .max_uV = 3300000,
981 .load_lp_uA = 5000, 981 .load_lp_uA = 5000,
982 .update_bank = 0x04, 982 .update_bank = 0x04,
983 .update_reg = 0x09, 983 .update_reg = 0x09,
@@ -1000,8 +1000,6 @@ static struct ab8500_regulator_info
1000 .owner = THIS_MODULE, 1000 .owner = THIS_MODULE,
1001 .n_voltages = ARRAY_SIZE(ldo_vaux3_voltages), 1001 .n_voltages = ARRAY_SIZE(ldo_vaux3_voltages),
1002 }, 1002 },
1003 .min_uV = 1100000,
1004 .max_uV = 3300000,
1005 .load_lp_uA = 5000, 1003 .load_lp_uA = 5000,
1006 .update_bank = 0x04, 1004 .update_bank = 0x04,
1007 .update_reg = 0x0a, 1005 .update_reg = 0x0a,
@@ -1024,8 +1022,6 @@ static struct ab8500_regulator_info
1024 .owner = THIS_MODULE, 1022 .owner = THIS_MODULE,
1025 .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), 1023 .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
1026 }, 1024 },
1027 .min_uV = 1100000,
1028 .max_uV = 3300000,
1029 .load_lp_uA = 5000, 1025 .load_lp_uA = 5000,
1030 /* values for Vaux4Regu register */ 1026 /* values for Vaux4Regu register */
1031 .update_bank = 0x04, 1027 .update_bank = 0x04,
@@ -1050,8 +1046,6 @@ static struct ab8500_regulator_info
1050 .owner = THIS_MODULE, 1046 .owner = THIS_MODULE,
1051 .n_voltages = ARRAY_SIZE(ldo_vintcore_voltages), 1047 .n_voltages = ARRAY_SIZE(ldo_vintcore_voltages),
1052 }, 1048 },
1053 .min_uV = 1100000,
1054 .max_uV = 3300000,
1055 .load_lp_uA = 5000, 1049 .load_lp_uA = 5000,
1056 .update_bank = 0x03, 1050 .update_bank = 0x03,
1057 .update_reg = 0x80, 1051 .update_reg = 0x80,
@@ -1080,9 +1074,9 @@ static struct ab8500_regulator_info
1080 .id = AB8500_LDO_TVOUT, 1074 .id = AB8500_LDO_TVOUT,
1081 .owner = THIS_MODULE, 1075 .owner = THIS_MODULE,
1082 .n_voltages = 1, 1076 .n_voltages = 1,
1077 .volt_table = fixed_2000000_voltage,
1083 }, 1078 },
1084 .delay = 10000, 1079 .delay = 10000,
1085 .fixed_uV = 2000000,
1086 .load_lp_uA = 1000, 1080 .load_lp_uA = 1000,
1087 .update_bank = 0x03, 1081 .update_bank = 0x03,
1088 .update_reg = 0x80, 1082 .update_reg = 0x80,
@@ -1099,8 +1093,8 @@ static struct ab8500_regulator_info
1099 .id = AB9540_LDO_USB, 1093 .id = AB9540_LDO_USB,
1100 .owner = THIS_MODULE, 1094 .owner = THIS_MODULE,
1101 .n_voltages = 1, 1095 .n_voltages = 1,
1096 .volt_table = fixed_3300000_voltage,
1102 }, 1097 },
1103 .fixed_uV = 3300000,
1104 .update_bank = 0x03, 1098 .update_bank = 0x03,
1105 .update_reg = 0x82, 1099 .update_reg = 0x82,
1106 .update_mask = 0x03, 1100 .update_mask = 0x03,
@@ -1116,8 +1110,8 @@ static struct ab8500_regulator_info
1116 .id = AB8500_LDO_AUDIO, 1110 .id = AB8500_LDO_AUDIO,
1117 .owner = THIS_MODULE, 1111 .owner = THIS_MODULE,
1118 .n_voltages = 1, 1112 .n_voltages = 1,
1113 .volt_table = fixed_2000000_voltage,
1119 }, 1114 },
1120 .fixed_uV = 2000000,
1121 .update_bank = 0x03, 1115 .update_bank = 0x03,
1122 .update_reg = 0x83, 1116 .update_reg = 0x83,
1123 .update_mask = 0x02, 1117 .update_mask = 0x02,
@@ -1131,8 +1125,8 @@ static struct ab8500_regulator_info
1131 .id = AB8500_LDO_ANAMIC1, 1125 .id = AB8500_LDO_ANAMIC1,
1132 .owner = THIS_MODULE, 1126 .owner = THIS_MODULE,
1133 .n_voltages = 1, 1127 .n_voltages = 1,
1128 .volt_table = fixed_2050000_voltage,
1134 }, 1129 },
1135 .fixed_uV = 2050000,
1136 .update_bank = 0x03, 1130 .update_bank = 0x03,
1137 .update_reg = 0x83, 1131 .update_reg = 0x83,
1138 .update_mask = 0x08, 1132 .update_mask = 0x08,
@@ -1146,8 +1140,8 @@ static struct ab8500_regulator_info
1146 .id = AB8500_LDO_ANAMIC2, 1140 .id = AB8500_LDO_ANAMIC2,
1147 .owner = THIS_MODULE, 1141 .owner = THIS_MODULE,
1148 .n_voltages = 1, 1142 .n_voltages = 1,
1143 .volt_table = fixed_2050000_voltage,
1149 }, 1144 },
1150 .fixed_uV = 2050000,
1151 .update_bank = 0x03, 1145 .update_bank = 0x03,
1152 .update_reg = 0x83, 1146 .update_reg = 0x83,
1153 .update_mask = 0x10, 1147 .update_mask = 0x10,
@@ -1161,8 +1155,8 @@ static struct ab8500_regulator_info
1161 .id = AB8500_LDO_DMIC, 1155 .id = AB8500_LDO_DMIC,
1162 .owner = THIS_MODULE, 1156 .owner = THIS_MODULE,
1163 .n_voltages = 1, 1157 .n_voltages = 1,
1158 .volt_table = fixed_1800000_voltage,
1164 }, 1159 },
1165 .fixed_uV = 1800000,
1166 .update_bank = 0x03, 1160 .update_bank = 0x03,
1167 .update_reg = 0x83, 1161 .update_reg = 0x83,
1168 .update_mask = 0x04, 1162 .update_mask = 0x04,
@@ -1180,8 +1174,8 @@ static struct ab8500_regulator_info
1180 .id = AB8500_LDO_ANA, 1174 .id = AB8500_LDO_ANA,
1181 .owner = THIS_MODULE, 1175 .owner = THIS_MODULE,
1182 .n_voltages = 1, 1176 .n_voltages = 1,
1177 .volt_table = fixed_1200000_voltage,
1183 }, 1178 },
1184 .fixed_uV = 1200000,
1185 .load_lp_uA = 1000, 1179 .load_lp_uA = 1000,
1186 .update_bank = 0x04, 1180 .update_bank = 0x04,
1187 .update_reg = 0x06, 1181 .update_reg = 0x06,
@@ -1346,6 +1340,7 @@ static struct ab8500_regulator_info
1346 .id = AB8500_LDO_AUDIO, 1340 .id = AB8500_LDO_AUDIO,
1347 .owner = THIS_MODULE, 1341 .owner = THIS_MODULE,
1348 .n_voltages = 1, 1342 .n_voltages = 1,
1343 .volt_table = fixed_2000000_voltage,
1349 }, 1344 },
1350 .update_bank = 0x03, 1345 .update_bank = 0x03,
1351 .update_reg = 0x83, 1346 .update_reg = 0x83,
@@ -1360,6 +1355,7 @@ static struct ab8500_regulator_info
1360 .id = AB8500_LDO_ANAMIC1, 1355 .id = AB8500_LDO_ANAMIC1,
1361 .owner = THIS_MODULE, 1356 .owner = THIS_MODULE,
1362 .n_voltages = 1, 1357 .n_voltages = 1,
1358 .volt_table = fixed_2050000_voltage,
1363 }, 1359 },
1364 .update_bank = 0x03, 1360 .update_bank = 0x03,
1365 .update_reg = 0x83, 1361 .update_reg = 0x83,
@@ -1374,6 +1370,7 @@ static struct ab8500_regulator_info
1374 .id = AB8500_LDO_ANAMIC2, 1370 .id = AB8500_LDO_ANAMIC2,
1375 .owner = THIS_MODULE, 1371 .owner = THIS_MODULE,
1376 .n_voltages = 1, 1372 .n_voltages = 1,
1373 .volt_table = fixed_2050000_voltage,
1377 }, 1374 },
1378 .update_bank = 0x03, 1375 .update_bank = 0x03,
1379 .update_reg = 0x83, 1376 .update_reg = 0x83,
@@ -1406,6 +1403,7 @@ static struct ab8500_regulator_info
1406 .id = AB8500_LDO_ANA, 1403 .id = AB8500_LDO_ANA,
1407 .owner = THIS_MODULE, 1404 .owner = THIS_MODULE,
1408 .n_voltages = 1, 1405 .n_voltages = 1,
1406 .volt_table = fixed_1200000_voltage,
1409 }, 1407 },
1410 .load_lp_uA = 1000, 1408 .load_lp_uA = 1000,
1411 .update_bank = 0x04, 1409 .update_bank = 0x04,
@@ -1424,8 +1422,6 @@ static struct ab8500_regulator_info
1424 .owner = THIS_MODULE, 1422 .owner = THIS_MODULE,
1425 .n_voltages = ARRAY_SIZE(ldo_sdio_voltages), 1423 .n_voltages = ARRAY_SIZE(ldo_sdio_voltages),
1426 }, 1424 },
1427 .min_uV = 1050000,
1428 .max_uV = 3050000,
1429 .load_lp_uA = 5000, 1425 .load_lp_uA = 5000,
1430 .update_bank = 0x03, 1426 .update_bank = 0x03,
1431 .update_reg = 0x88, 1427 .update_reg = 0x88,