Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (45 commits)
  regulator: missing index in PTR_ERR() in isl6271a_probe()
  regulator: Assign return value of mc13xxx_reg_rmw to ret
  regulator: Add initial per-regulator debugfs support
  regulator: Make regulator_has_full_constraints a bool
  regulator: Clean up logging a bit
  regulator: Optimise out noop voltage changes
  regulator: Add API to re-apply voltage to hardware
  regulator: Staticise non-exported functions in mc13892
  regulator: Only notify voltage changes when they succeed
  regulator: Provide a selector based set_voltage_sel() operation
  regulator: Factor out voltage set operation into a separate function
  regulator: Convert WM8994 to use get_voltage_sel()
  regulator: Convert WM835x to use get_voltage_sel()
  regulator: Allow modular build of mc13xxx-core
  regulator: support PMIC mc13892
  make mc13783 regulator code generic
  Change the register name definitions for mc13783
  mach-ux500: Updated and connected ab8500 regulator board configuration
  regulators: Removed macros for initialization of ab8500 regulators
  regulators: Added verbose debug messages to ab8500 regulators
  ...

6 files changed, 102 insertions, 85 deletions

diff --git a/arch/arm/mach-imx/mach-pcm038.c b/arch/arm/mach-imx/mach-pcm038.c
index f667a262dfc1..505614803bc6 100644
--- a/arch/arm/mach-imx/mach-pcm038.c
+++ b/arch/arm/mach-imx/mach-pcm038.c
@@ -254,10 +254,10 @@ static struct regulator_init_data cam_data = {
 
 static struct mc13783_regulator_init_data pcm038_regulators[] = {
         {
-                .id = MC13783_REGU_VCAM,
+                .id = MC13783_REG_VCAM,
                 .init_data = &cam_data,
         }, {
-                .id = MC13783_REGU_VMMC1,
+                .id = MC13783_REG_VMMC1,
                 .init_data = &sdhc1_data,
         },
 };
diff --git a/arch/arm/mach-mx3/mach-mx31_3ds.c b/arch/arm/mach-mx3/mach-mx31_3ds.c
index 4e516b49a901..899a969e92fa 100644
--- a/arch/arm/mach-mx3/mach-mx31_3ds.c
+++ b/arch/arm/mach-mx3/mach-mx31_3ds.c
@@ -140,10 +140,10 @@ static struct regulator_init_data gpo_init = {
 
 static struct mc13783_regulator_init_data mx31_3ds_regulators[] = {
         {
-                .id = MC13783_REGU_PWGT1SPI, /* Power Gate for ARM core. */
+                .id = MC13783_REG_PWGT1SPI, /* Power Gate for ARM core. */
                 .init_data = &pwgtx_init,
         }, {
-                .id = MC13783_REGU_PWGT2SPI, /* Power Gate for L2 Cache. */
+                .id = MC13783_REG_PWGT2SPI, /* Power Gate for L2 Cache. */
                 .init_data = &pwgtx_init,
         }, {
 
diff --git a/arch/arm/mach-mx3/mach-mx31moboard.c b/arch/arm/mach-mx3/mach-mx31moboard.c
index 203d21a510aa..1aa8d65fccbb 100644
--- a/arch/arm/mach-mx3/mach-mx31moboard.c
+++ b/arch/arm/mach-mx3/mach-mx31moboard.c
@@ -216,11 +216,11 @@ static struct regulator_init_data cam_vreg_data = {
 
 static struct mc13783_regulator_init_data moboard_regulators[] = {
         {
-                .id = MC13783_REGU_VMMC1,
+                .id = MC13783_REG_VMMC1,
                 .init_data = &sdhc_vreg_data,
         },
         {
-                .id = MC13783_REGU_VCAM,
+                .id = MC13783_REG_VCAM,
                 .init_data = &cam_vreg_data,
         },
 };
diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c
index 1187f1fc2e53..533967c2d095 100644
--- 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,
+                },
         },
 };
-
diff --git a/arch/arm/mach-ux500/board-mop500-regulators.h b/arch/arm/mach-ux500/board-mop500-regulators.h
new file mode 100644
index 000000000000..2675fae52537
--- /dev/null
+++ b/arch/arm/mach-ux500/board-mop500-regulators.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2010
+ *
+ * License Terms: GNU General Public License v2
+ *
+ * Author: Bengt Jonsson <bengt.g.jonsson@stericsson.com> for ST-Ericsson
+ *
+ * MOP500 board specific initialization for regulators
+ */
+
+#ifndef __BOARD_MOP500_REGULATORS_H
+#define __BOARD_MOP500_REGULATORS_H
+
+#include <linux/regulator/machine.h>
+#include <linux/regulator/ab8500.h>
+
+extern struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS];
+
+#endif
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index a1c9ea1a66df..a393f57ed2a8 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -35,6 +35,7 @@
 #include "devices-db8500.h"
 #include "pins-db8500.h"
 #include "board-mop500.h"
+#include "board-mop500-regulators.h"
 
 static pin_cfg_t mop500_pins[] = {
         /* SSP0 */
@@ -80,6 +81,8 @@ static pin_cfg_t mop500_pins[] = {
 
 static struct ab8500_platform_data ab8500_platdata = {
         .irq_base       = MOP500_AB8500_IRQ_BASE,
+        .regulator      = ab8500_regulators,
+        .num_regulator  = ARRAY_SIZE(ab8500_regulators),
 };
 
 static struct resource ab8500_resources[] = {