3 files changed, 29 insertions, 15 deletions

diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h
index f509877c2ed4..6a210f1511fc 100644
--- a/include/linux/regulator/ab8500.h
+++ b/include/linux/regulator/ab8500.h
@@ -11,15 +11,17 @@
 #define __LINUX_MFD_AB8500_REGULATOR_H
 
 /* AB8500 regulators */
-#define AB8500_LDO_AUX1         0
-#define AB8500_LDO_AUX2         1
-#define AB8500_LDO_AUX3         2
-#define AB8500_LDO_INTCORE      3
-#define AB8500_LDO_TVOUT        4
-#define AB8500_LDO_AUDIO        5
-#define AB8500_LDO_ANAMIC1      6
-#define AB8500_LDO_ANAMIC2      7
-#define AB8500_LDO_DMIC         8
-#define AB8500_LDO_ANA          9
-
+enum ab8500_regulator_id {
+        AB8500_LDO_AUX1,
+        AB8500_LDO_AUX2,
+        AB8500_LDO_AUX3,
+        AB8500_LDO_INTCORE,
+        AB8500_LDO_TVOUT,
+        AB8500_LDO_AUDIO,
+        AB8500_LDO_ANAMIC1,
+        AB8500_LDO_ANAMIC2,
+        AB8500_LDO_DMIC,
+        AB8500_LDO_ANA,
+        AB8500_NUM_REGULATORS,
+};
 #endif
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index ebd747265294..7954f6bd7edb 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -154,6 +154,7 @@ int regulator_is_supported_voltage(struct regulator *regulator,
                                    int min_uV, int max_uV);
 int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV);
 int regulator_get_voltage(struct regulator *regulator);
+int regulator_sync_voltage(struct regulator *regulator);
 int regulator_set_current_limit(struct regulator *regulator,
                                int min_uA, int max_uA);
 int regulator_get_current_limit(struct regulator *regulator);
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index 592cd7c642c2..b8ed16a33c47 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -42,7 +42,11 @@ enum regulator_status {
  *
  * @set_voltage: Set the voltage for the regulator within the range specified.
  *               The driver should select the voltage closest to min_uV.
+ * @set_voltage_sel: Set the voltage for the regulator using the specified
+ *                   selector.
  * @get_voltage: Return the currently configured voltage for the regulator.
+ * @get_voltage_sel: Return the currently configured voltage selector for the
+ *                   regulator.
  * @list_voltage: Return one of the supported voltages, in microvolts; zero
  *      if the selector indicates a voltage that is unusable on this system;
  *      or negative errno.  Selectors range from zero to one less than
@@ -79,8 +83,11 @@ struct regulator_ops {
         int (*list_voltage) (struct regulator_dev *, unsigned selector);
 
         /* get/set regulator voltage */
-        int (*set_voltage) (struct regulator_dev *, int min_uV, int max_uV);
+        int (*set_voltage) (struct regulator_dev *, int min_uV, int max_uV,
+                            unsigned *selector);
+        int (*set_voltage_sel) (struct regulator_dev *, unsigned selector);
         int (*get_voltage) (struct regulator_dev *);
+        int (*get_voltage_sel) (struct regulator_dev *);
 
         /* get/set regulator current  */
         int (*set_current_limit) (struct regulator_dev *,
@@ -168,9 +175,9 @@ struct regulator_desc {
  */
 struct regulator_dev {
         struct regulator_desc *desc;
-        int use_count;
-        int open_count;
         int exclusive;
+        u32 use_count;
+        u32 open_count;
 
         /* lists we belong to */
         struct list_head list; /* list of all regulators */
@@ -188,10 +195,14 @@ struct regulator_dev {
         struct regulator_dev *supply;   /* for tree */
 
         void *reg_data;         /* regulator_dev data */
+
+#ifdef CONFIG_DEBUG_FS
+        struct dentry *debugfs;
+#endif
 };
 
 struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
-        struct device *dev, struct regulator_init_data *init_data,
+        struct device *dev, const struct regulator_init_data *init_data,
         void *driver_data);
 void regulator_unregister(struct regulator_dev *rdev);