5 files changed, 141 insertions, 13 deletions

diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index fa8b55b8191c..b0432cc2b169 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -19,6 +19,7 @@
 #include <linux/notifier.h>
 #include <linux/regulator/consumer.h>
 
+struct regmap;
 struct regulator_dev;
 struct regulator_init_data;
 
@@ -45,6 +46,7 @@ enum regulator_status {
  *               The driver should select the voltage closest to min_uV.
  * @set_voltage_sel: Set the voltage for the regulator using the specified
  *                   selector.
+ * @map_voltage: Convert a voltage into a selector
  * @get_voltage: Return the currently configured voltage for the regulator.
  * @get_voltage_sel: Return the currently configured voltage selector for the
  *                   regulator.
@@ -90,6 +92,7 @@ struct regulator_ops {
         /* get/set regulator voltage */
         int (*set_voltage) (struct regulator_dev *, int min_uV, int max_uV,
                             unsigned *selector);
+        int (*map_voltage)(struct regulator_dev *, int min_uV, int max_uV);
         int (*set_voltage_sel) (struct regulator_dev *, unsigned selector);
         int (*get_voltage) (struct regulator_dev *);
         int (*get_voltage_sel) (struct regulator_dev *);
@@ -148,19 +151,30 @@ enum regulator_type {
 };
 
 /**
- * struct regulator_desc - Regulator descriptor
+ * struct regulator_desc - Static regulator descriptor
  *
- * Each regulator registered with the core is described with a structure of
- * this type.
+ * Each regulator registered with the core is described with a
+ * structure of this type and a struct regulator_config.  This
+ * structure contains the non-varying parts of the regulator
+ * description.
  *
  * @name: Identifying name for the regulator.
  * @supply_name: Identifying the regulator supply
  * @id: Numerical identifier for the regulator.
- * @n_voltages: Number of selectors available for ops.list_voltage().
  * @ops: Regulator operations table.
  * @irq: Interrupt number for the regulator.
  * @type: Indicates if the regulator is a voltage or current regulator.
  * @owner: Module providing the regulator, used for refcounting.
+ *
+ * @n_voltages: Number of selectors available for ops.list_voltage().
+ *
+ * @min_uV: Voltage given by the lowest selector (if linear mapping)
+ * @uV_step: Voltage increase with each selector (if linear mapping)
+ *
+ * @vsel_reg: Register for selector when using regulator_regmap_X_voltage_
+ * @vsel_mask: Mask for register bitfield used for selector
+ * @enable_reg: Register for control when using regmap enable/disable ops
+ * @enable_mask: Mask for control when using regmap enable/disable ops
  */
 struct regulator_desc {
         const char *name;
@@ -171,6 +185,36 @@ struct regulator_desc {
         int irq;
         enum regulator_type type;
         struct module *owner;
+
+        unsigned int min_uV;
+        unsigned int uV_step;
+
+        unsigned int vsel_reg;
+        unsigned int vsel_mask;
+        unsigned int enable_reg;
+        unsigned int enable_mask;
+};
+
+/**
+ * struct regulator_config - Dynamic regulator descriptor
+ *
+ * Each regulator registered with the core is described with a
+ * structure of this type and a struct regulator_desc.  This structure
+ * contains the runtime variable parts of the regulator description.
+ *
+ * @dev: struct device for the regulator
+ * @init_data: platform provided init data, passed through by driver
+ * @driver_data: private regulator data
+ * @of_node: OpenFirmware node to parse for device tree bindings (may be
+ *           NULL).
+ * @regmap: regmap to use for core regmap helpers
+ */
+struct regulator_config {
+        struct device *dev;
+        const struct regulator_init_data *init_data;
+        void *driver_data;
+        struct device_node *of_node;
+        struct regmap *regmap;
 };
 
 /*
@@ -184,7 +228,7 @@ struct regulator_desc {
  * no other direct access).
  */
 struct regulator_dev {
-        struct regulator_desc *desc;
+        const struct regulator_desc *desc;
         int exclusive;
         u32 use_count;
         u32 open_count;
@@ -201,6 +245,7 @@ struct regulator_dev {
         struct device dev;
         struct regulation_constraints *constraints;
         struct regulator *supply;       /* for tree */
+        struct regmap *regmap;
 
         struct delayed_work disable_work;
         int deferred_disables;
@@ -210,9 +255,9 @@ struct regulator_dev {
         struct dentry *debugfs;
 };
 
-struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
-        struct device *dev, const struct regulator_init_data *init_data,
-        void *driver_data, struct device_node *of_node);
+struct regulator_dev *
+regulator_register(const struct regulator_desc *regulator_desc,
+                   const struct regulator_config *config);
 void regulator_unregister(struct regulator_dev *rdev);
 
 int regulator_notifier_call_chain(struct regulator_dev *rdev,
@@ -224,6 +269,18 @@ int rdev_get_id(struct regulator_dev *rdev);
 
 int regulator_mode_to_status(unsigned int);
 
+int regulator_list_voltage_linear(struct regulator_dev *rdev,
+                                  unsigned int selector);
+int regulator_map_voltage_linear(struct regulator_dev *rdev,
+                                  int min_uV, int max_uV);
+int regulator_map_voltage_iterate(struct regulator_dev *rdev,
+                                  int min_uV, int max_uV);
+int regulator_get_voltage_sel_regmap(struct regulator_dev *rdev);
+int regulator_set_voltage_sel_regmap(struct regulator_dev *rdev, unsigned sel);
+int regulator_is_enabled_regmap(struct regulator_dev *rdev);
+int regulator_enable_regmap(struct regulator_dev *rdev);
+int regulator_disable_regmap(struct regulator_dev *rdev);
+
 void *regulator_get_init_drvdata(struct regulator_init_data *reg_init_data);
 
 #endif
diff --git a/include/linux/regulator/fixed.h b/include/linux/regulator/fixed.h
index 936a7d8c11a9..f83f7440b488 100644
--- a/include/linux/regulator/fixed.h
+++ b/include/linux/regulator/fixed.h
@@ -26,6 +26,12 @@ struct regulator_init_data;
  * @gpio:               GPIO to use for enable control
  *                      set to -EINVAL if not used
  * @startup_delay:      Start-up time in microseconds
+ * @gpio_is_open_drain: Gpio pin is open drain or normal type.
+ *                      If it is open drain type then HIGH will be set
+ *                      through PULL-UP with setting gpio as input
+ *                      and low will be set as gpio-output with driven
+ *                      to low. For non-open-drain case, the gpio will
+ *                      will be in output and drive to low/high accordingly.
  * @enable_high:        Polarity of enable GPIO
  *                      1 = Active high, 0 = Active low
  * @enabled_at_boot:    Whether regulator has been enabled at
@@ -43,6 +49,7 @@ struct fixed_voltage_config {
         int microvolts;
         int gpio;
         unsigned startup_delay;
+        unsigned gpio_is_open_drain:1;
         unsigned enable_high:1;
         unsigned enabled_at_boot:1;
         struct regulator_init_data *init_data;
diff --git a/include/linux/regulator/of_regulator.h b/include/linux/regulator/of_regulator.h
index 769704f296e5..f9217965aaa3 100644
--- a/include/linux/regulator/of_regulator.h
+++ b/include/linux/regulator/of_regulator.h
@@ -6,10 +6,20 @@
 #ifndef __LINUX_OF_REG_H
 #define __LINUX_OF_REG_H
 
+struct of_regulator_match {
+        const char *name;
+        void *driver_data;
+        struct regulator_init_data *init_data;
+        struct device_node *of_node;
+};
+
 #if defined(CONFIG_OF)
 extern struct regulator_init_data
         *of_get_regulator_init_data(struct device *dev,
                                     struct device_node *node);
+extern int of_regulator_match(struct device *dev, struct device_node *node,
+                              struct of_regulator_match *matches,
+                              unsigned int num_matches);
 #else
 static inline struct regulator_init_data
         *of_get_regulator_init_data(struct device *dev,
@@ -17,6 +27,14 @@ static inline struct regulator_init_data
 {
         return NULL;
 }
+
+static inline int of_regulator_match(struct device *dev,
+                                     struct device_node *node,
+                                     struct of_regulator_match *matches,
+                                     unsigned int num_matches)
+{
+        return 0;
+}
 #endif /* CONFIG_OF */
 
 #endif /* __LINUX_OF_REG_H */
diff --git a/include/linux/regulator/tps62360.h b/include/linux/regulator/tps62360.h
index 6a5c1b2c751e..a4c49394c497 100644
--- a/include/linux/regulator/tps62360.h
+++ b/include/linux/regulator/tps62360.h
@@ -26,13 +26,10 @@
 #ifndef __LINUX_REGULATOR_TPS62360_H
 #define __LINUX_REGULATOR_TPS62360_H
 
-#include <linux/regulator/machine.h>
-
 /*
  * struct tps62360_regulator_platform_data - tps62360 regulator platform data.
  *
  * @reg_init_data: The regulator init data.
- * @en_force_pwm: Enable force pwm or not.
  * @en_discharge: Enable discharge the output capacitor via internal
  *                register.
  * @en_internal_pulldn: internal pull down enable or not.
@@ -44,8 +41,7 @@
  * @vsel1_def_state: Default state of vsel1. 1 if it is high else 0.
  */
 struct tps62360_regulator_platform_data {
-        struct regulator_init_data reg_init_data;
-        bool en_force_pwm;
+        struct regulator_init_data *reg_init_data;
         bool en_discharge;
         bool en_internal_pulldn;
         int vsel0_gpio;
diff --git a/include/linux/regulator/tps65090-regulator.h b/include/linux/regulator/tps65090-regulator.h
new file mode 100644
index 000000000000..0fa04b64db3e
--- /dev/null
+++ b/include/linux/regulator/tps65090-regulator.h
@@ -0,0 +1,50 @@
+/*
+ * Regulator driver interface for TI TPS65090 PMIC family
+ *
+ * Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __REGULATOR_TPS65090_H
+#define __REGULATOR_TPS65090_H
+
+#include <linux/regulator/machine.h>
+
+#define tps65090_rails(_name) "tps65090_"#_name
+
+enum {
+        TPS65090_ID_DCDC1,
+        TPS65090_ID_DCDC2,
+        TPS65090_ID_DCDC3,
+        TPS65090_ID_FET1,
+        TPS65090_ID_FET2,
+        TPS65090_ID_FET3,
+        TPS65090_ID_FET4,
+        TPS65090_ID_FET5,
+        TPS65090_ID_FET6,
+        TPS65090_ID_FET7,
+};
+
+/*
+ * struct tps65090_regulator_platform_data
+ *
+ * @regulator: The regulator init data.
+ * @slew_rate_uV_per_us: Slew rate microvolt per microsec.
+ */
+
+struct tps65090_regulator_platform_data {
+        struct regulator_init_data regulator;
+};
+
+#endif  /* __REGULATOR_TPS65090_H */