Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-ux500 / board-mop500-regulators.c

diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c
index 1187f1fc2e535eac634e361c75cbd904b15534dc..533967c2d09539fa98438f55ee08f29f03f2f7ad 100644 (file)
--- a/arch/arm/mach-ux500/board-mop500-regulators.c
+++ b/arch/arm/mach-ux500/board-mop500-regulators.c
@@ -3,99 +3,94 @@
  *
  * License Terms: GNU General Public License v2
  *
- * Author: Sundar Iyer <sundar.iyer@stericsson.com>
+ * Authors: Sundar Iyer <sundar.iyer@stericsson.com>
+ *          Bengt Jonsson <bengt.g.jonsson@stericsson.com>
  *
  * MOP500 board specific initialization for regulators
  */
 #include <linux/kernel.h>
 #include <linux/regulator/machine.h>
+#include <linux/regulator/ab8500.h>
 
-/* supplies to the display/camera */
-static struct regulator_init_data ab8500_vaux1_regulator = {
-       .constraints = {
-               .name = "V-DISPLAY",
-               .min_uV = 2500000,
-               .max_uV = 2900000,
-               .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE|
-                                       REGULATOR_CHANGE_STATUS,
+/* AB8500 regulators */
+struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = {
+       /* supplies to the display/camera */
+       [AB8500_LDO_AUX1] = {
+               .constraints = {
+                       .name = "V-DISPLAY",
+                       .min_uV = 2500000,
+                       .max_uV = 2900000,
+                       .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
+                                         REGULATOR_CHANGE_STATUS,
+               },
        },
-};
-
-/* supplies to the on-board eMMC */
-static struct regulator_init_data ab8500_vaux2_regulator = {
-       .constraints = {
-               .name = "V-eMMC1",
-               .min_uV = 1100000,
-               .max_uV = 3300000,
-               .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE|
-                                       REGULATOR_CHANGE_STATUS,
+       /* supplies to the on-board eMMC */
+       [AB8500_LDO_AUX2] = {
+               .constraints = {
+                       .name = "V-eMMC1",
+                       .min_uV = 1100000,
+                       .max_uV = 3300000,
+                       .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
+                                         REGULATOR_CHANGE_STATUS,
+               },
        },
-};
-
-/* supply for VAUX3, supplies to SDcard slots */
-static struct regulator_init_data ab8500_vaux3_regulator = {
-       .constraints = {
-               .name = "V-MMC-SD",
-               .min_uV = 1100000,
-               .max_uV = 3300000,
-               .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE|
-                                       REGULATOR_CHANGE_STATUS,
+       /* supply for VAUX3, supplies to SDcard slots */
+       [AB8500_LDO_AUX3] = {
+               .constraints = {
+                       .name = "V-MMC-SD",
+                       .min_uV = 1100000,
+                       .max_uV = 3300000,
+                       .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
+                                         REGULATOR_CHANGE_STATUS,
+               },
        },
-};
-
-/* supply for tvout, gpadc, TVOUT LDO */
-static struct regulator_init_data ab8500_vtvout_init = {
-       .constraints = {
-               .name = "V-TVOUT",
-               .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+       /* supply for tvout, gpadc, TVOUT LDO */
+       [AB8500_LDO_TVOUT] = {
+               .constraints = {
+                       .name = "V-TVOUT",
+                       .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+               },
        },
-};
-
-/* supply for ab8500-vaudio, VAUDIO LDO */
-static struct regulator_init_data ab8500_vaudio_init = {
-       .constraints = {
-               .name = "V-AUD",
-               .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+       /* supply for ab8500-vaudio, VAUDIO LDO */
+       [AB8500_LDO_AUDIO] = {
+               .constraints = {
+                       .name = "V-AUD",
+                       .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+               },
        },
-};
-
-/* supply for v-anamic1 VAMic1-LDO */
-static struct regulator_init_data ab8500_vamic1_init = {
-       .constraints = {
-               .name = "V-AMIC1",
-               .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+       /* supply for v-anamic1 VAMic1-LDO */
+       [AB8500_LDO_ANAMIC1] = {
+               .constraints = {
+                       .name = "V-AMIC1",
+                       .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+               },
        },
-};
-
-/* supply for v-amic2, VAMIC2 LDO, reuse constants for AMIC1 */
-static struct regulator_init_data ab8500_vamic2_init = {
-       .constraints = {
-               .name = "V-AMIC2",
-               .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+       /* supply for v-amic2, VAMIC2 LDO, reuse constants for AMIC1 */
+       [AB8500_LDO_ANAMIC2] = {
+               .constraints = {
+                       .name = "V-AMIC2",
+                       .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+               },
        },
-};
-
-/* supply for v-dmic, VDMIC LDO */
-static struct regulator_init_data ab8500_vdmic_init = {
-       .constraints = {
-               .name = "V-DMIC",
-               .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+       /* supply for v-dmic, VDMIC LDO */
+       [AB8500_LDO_DMIC] = {
+               .constraints = {
+                       .name = "V-DMIC",
+                       .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+               },
        },
-};
-
-/* supply for v-intcore12, VINTCORE12 LDO */
-static struct regulator_init_data ab8500_vintcore_init = {
-       .constraints = {
-               .name = "V-INTCORE",
-               .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+       /* supply for v-intcore12, VINTCORE12 LDO */
+       [AB8500_LDO_INTCORE] = {
+               .constraints = {
+                       .name = "V-INTCORE",
+                       .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+               },
        },
-};
-
-/* supply for U8500 CSI/DSI, VANA LDO */
-static struct regulator_init_data ab8500_vana_init = {
-       .constraints = {
-               .name = "V-CSI/DSI",
-               .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+       /* supply for U8500 CSI/DSI, VANA LDO */
+       [AB8500_LDO_ANA] = {
+               .constraints = {
+                       .name = "V-CSI/DSI",
+                       .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+               },
        },
 };
-