Patched in Tegra support.

11 files changed, 62 insertions, 602 deletions

diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h
index 7bd73bbdfd1..76579f964a2 100644
--- a/include/linux/regulator/ab8500.h
+++ b/include/linux/regulator/ab8500.h
@@ -26,26 +26,7 @@ enum ab8500_regulator_id {
         AB8500_NUM_REGULATORS,
 };
 
-/* AB9450 regulators */
-enum ab9540_regulator_id {
-        AB9540_LDO_AUX1,
-        AB9540_LDO_AUX2,
-        AB9540_LDO_AUX3,
-        AB9540_LDO_AUX4,
-        AB9540_LDO_INTCORE,
-        AB9540_LDO_TVOUT,
-        AB9540_LDO_USB,
-        AB9540_LDO_AUDIO,
-        AB9540_LDO_ANAMIC1,
-        AB9540_LDO_ANAMIC2,
-        AB9540_LDO_DMIC,
-        AB9540_LDO_ANA,
-        AB9540_SYSCLKREQ_2,
-        AB9540_SYSCLKREQ_4,
-        AB9540_NUM_REGULATORS,
-};
-
-/* AB8500 and AB9540 register initialization */
+/* AB8500 register initialization */
 struct ab8500_regulator_reg_init {
         int id;
         u8 value;
@@ -90,53 +71,4 @@ enum ab8500_regulator_reg {
         AB8500_NUM_REGULATOR_REGISTERS,
 };
 
-
-/* AB9540 registers */
-enum ab9540_regulator_reg {
-        AB9540_REGUREQUESTCTRL1,
-        AB9540_REGUREQUESTCTRL2,
-        AB9540_REGUREQUESTCTRL3,
-        AB9540_REGUREQUESTCTRL4,
-        AB9540_REGUSYSCLKREQ1HPVALID1,
-        AB9540_REGUSYSCLKREQ1HPVALID2,
-        AB9540_REGUHWHPREQ1VALID1,
-        AB9540_REGUHWHPREQ1VALID2,
-        AB9540_REGUHWHPREQ2VALID1,
-        AB9540_REGUHWHPREQ2VALID2,
-        AB9540_REGUSWHPREQVALID1,
-        AB9540_REGUSWHPREQVALID2,
-        AB9540_REGUSYSCLKREQVALID1,
-        AB9540_REGUSYSCLKREQVALID2,
-        AB9540_REGUVAUX4REQVALID,
-        AB9540_REGUMISC1,
-        AB9540_VAUDIOSUPPLY,
-        AB9540_REGUCTRL1VAMIC,
-        AB9540_VSMPS1REGU,
-        AB9540_VSMPS2REGU,
-        AB9540_VSMPS3REGU, /* NOTE! PRCMU register */
-        AB9540_VPLLVANAREGU,
-        AB9540_EXTSUPPLYREGU,
-        AB9540_VAUX12REGU,
-        AB9540_VRF1VAUX3REGU,
-        AB9540_VSMPS1SEL1,
-        AB9540_VSMPS1SEL2,
-        AB9540_VSMPS1SEL3,
-        AB9540_VSMPS2SEL1,
-        AB9540_VSMPS2SEL2,
-        AB9540_VSMPS2SEL3,
-        AB9540_VSMPS3SEL1, /* NOTE! PRCMU register */
-        AB9540_VSMPS3SEL2, /* NOTE! PRCMU register */
-        AB9540_VAUX1SEL,
-        AB9540_VAUX2SEL,
-        AB9540_VRF1VAUX3SEL,
-        AB9540_REGUCTRL2SPARE,
-        AB9540_VAUX4REQCTRL,
-        AB9540_VAUX4REGU,
-        AB9540_VAUX4SEL,
-        AB9540_REGUCTRLDISCH,
-        AB9540_REGUCTRLDISCH2,
-        AB9540_REGUCTRLDISCH3,
-        AB9540_NUM_REGULATOR_REGISTERS,
-};
-
 #endif
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index 7bc732ce6e5..8699df6fbb7 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -2,6 +2,7 @@
  * consumer.h -- SoC Regulator consumer support.
  *
  * Copyright (C) 2007, 2008 Wolfson Microelectronics PLC.
+ * Copyright (C) 2012 NVIDIA Corporation
  *
  * Author: Liam Girdwood <lrg@slimlogic.co.uk>
  *
@@ -35,8 +36,7 @@
 #ifndef __LINUX_REGULATOR_CONSUMER_H_
 #define __LINUX_REGULATOR_CONSUMER_H_
 
-struct device;
-struct notifier_block;
+#include <linux/device.h>
 
 /*
  * Regulator operating modes.
@@ -93,6 +93,10 @@ struct notifier_block;
  * FORCE_DISABLE  Regulator forcibly shut down by software.
  * VOLTAGE_CHANGE Regulator voltage changed.
  * DISABLE        Regulator was disabled.
+ * PRE_ENABLE     Regulator is to be enabled
+ * POST_ENABLE    Regulator was enabled
+ * OUT_PRECHANGE  Regulator is enabled and its voltage is to be changed
+ * OUT_POSTCHANGE Regulator is enabled and its voltage was changed
  *
  * NOTE: These events can be OR'ed together when passed into handler.
  */
@@ -105,6 +109,10 @@ struct notifier_block;
 #define REGULATOR_EVENT_FORCE_DISABLE           0x20
 #define REGULATOR_EVENT_VOLTAGE_CHANGE          0x40
 #define REGULATOR_EVENT_DISABLE                 0x80
+#define REGULATOR_EVENT_PRE_ENABLE              0x100
+#define REGULATOR_EVENT_POST_ENABLE             0x200
+#define REGULATOR_EVENT_OUT_PRECHANGE           0x400
+#define REGULATOR_EVENT_OUT_POSTCHANGE          0x800
 
 struct regulator;
 
@@ -133,34 +141,25 @@ struct regulator_bulk_data {
 /* regulator get and put */
 struct regulator *__must_check regulator_get(struct device *dev,
                                              const char *id);
-struct regulator *__must_check devm_regulator_get(struct device *dev,
-                                             const char *id);
 struct regulator *__must_check regulator_get_exclusive(struct device *dev,
                                                        const char *id);
 void regulator_put(struct regulator *regulator);
-void devm_regulator_put(struct regulator *regulator);
 
 /* regulator output control and status */
 int regulator_enable(struct regulator *regulator);
 int regulator_disable(struct regulator *regulator);
 int regulator_force_disable(struct regulator *regulator);
 int regulator_is_enabled(struct regulator *regulator);
-int regulator_disable_deferred(struct regulator *regulator, int ms);
 
 int regulator_bulk_get(struct device *dev, int num_consumers,
                        struct regulator_bulk_data *consumers);
-int devm_regulator_bulk_get(struct device *dev, int num_consumers,
-                            struct regulator_bulk_data *consumers);
 int regulator_bulk_enable(int num_consumers,
                           struct regulator_bulk_data *consumers);
 int regulator_bulk_disable(int num_consumers,
                            struct regulator_bulk_data *consumers);
-int regulator_bulk_force_disable(int num_consumers,
-                           struct regulator_bulk_data *consumers);
 void regulator_bulk_free(int num_consumers,
                          struct regulator_bulk_data *consumers);
 
-int regulator_can_change_voltage(struct regulator *regulator);
 int regulator_count_voltages(struct regulator *regulator);
 int regulator_list_voltage(struct regulator *regulator, unsigned selector);
 int regulator_is_supported_voltage(struct regulator *regulator,
@@ -178,8 +177,6 @@ int regulator_set_mode(struct regulator *regulator, unsigned int mode);
 unsigned int regulator_get_mode(struct regulator *regulator);
 int regulator_set_optimum_mode(struct regulator *regulator, int load_uA);
 
-int regulator_allow_bypass(struct regulator *regulator, bool allow);
-
 /* regulator notifier block */
 int regulator_register_notifier(struct regulator *regulator,
                               struct notifier_block *nb);
@@ -209,21 +206,16 @@ static inline struct regulator *__must_check regulator_get(struct device *dev,
          */
         return NULL;
 }
-
-static inline struct regulator *__must_check
-devm_regulator_get(struct device *dev, const char *id)
+static inline struct regulator *__must_check regulator_get_exclusive(
+                struct device *dev, const char *id)
 {
+        /* See comment for regulator_get() stub, above */
         return NULL;
 }
-
 static inline void regulator_put(struct regulator *regulator)
 {
 }
 
-static inline void devm_regulator_put(struct regulator *regulator)
-{
-}
-
 static inline int regulator_enable(struct regulator *regulator)
 {
         return 0;
@@ -239,12 +231,6 @@ static inline int regulator_force_disable(struct regulator *regulator)
         return 0;
 }
 
-static inline int regulator_disable_deferred(struct regulator *regulator,
-                                             int ms)
-{
-        return 0;
-}
-
 static inline int regulator_is_enabled(struct regulator *regulator)
 {
         return 1;
@@ -257,12 +243,6 @@ static inline int regulator_bulk_get(struct device *dev,
         return 0;
 }
 
-static inline int devm_regulator_bulk_get(struct device *dev, int num_consumers,
-                                          struct regulator_bulk_data *consumers)
-{
-        return 0;
-}
-
 static inline int regulator_bulk_enable(int num_consumers,
                                         struct regulator_bulk_data *consumers)
 {
@@ -275,15 +255,26 @@ static inline int regulator_bulk_disable(int num_consumers,
         return 0;
 }
 
-static inline int regulator_bulk_force_disable(int num_consumers,
-                                        struct regulator_bulk_data *consumers)
+static inline void regulator_bulk_free(int num_consumers,
+                                       struct regulator_bulk_data *consumers)
+{
+}
+
+static inline int regulator_count_voltages(struct regulator *regulator)
 {
         return 0;
 }
 
-static inline void regulator_bulk_free(int num_consumers,
-                                       struct regulator_bulk_data *consumers)
+static inline int regulator_list_voltage(struct regulator *regulator,
+                                         unsigned selector)
 {
+        return 0;
+}
+
+static inline int regulator_is_supported_voltage(struct regulator *regulator,
+                                                 int min_uV, int max_uV)
+{
+        return 0;
 }
 
 static inline int regulator_set_voltage(struct regulator *regulator,
@@ -292,13 +283,18 @@ static inline int regulator_set_voltage(struct regulator *regulator,
         return 0;
 }
 
+static inline int regulator_set_voltage_time(struct regulator *regulator,
+                                             int old_uV, int new_uV)
+{
+        return 0;
+}
+
 static inline int regulator_get_voltage(struct regulator *regulator)
 {
-        return -EINVAL;
+        return 0;
 }
 
-static inline int regulator_is_supported_voltage(struct regulator *regulator,
-                                   int min_uV, int max_uV)
+static inline int regulator_sync_voltage(struct regulator *regulator)
 {
         return 0;
 }
@@ -331,12 +327,6 @@ static inline int regulator_set_optimum_mode(struct regulator *regulator,
         return REGULATOR_MODE_NORMAL;
 }
 
-static inline int regulator_allow_bypass(struct regulator *regulator,
-                                         bool allow)
-{
-        return 0;
-}
-
 static inline int regulator_register_notifier(struct regulator *regulator,
                               struct notifier_block *nb)
 {
@@ -359,25 +349,6 @@ static inline void regulator_set_drvdata(struct regulator *regulator,
 {
 }
 
-static inline int regulator_count_voltages(struct regulator *regulator)
-{
-        return 0;
-}
 #endif
 
-static inline int regulator_set_voltage_tol(struct regulator *regulator,
-                                            int new_uV, int tol_uV)
-{
-        return regulator_set_voltage(regulator,
-                                     new_uV - tol_uV, new_uV + tol_uV);
-}
-
-static inline int regulator_is_supported_voltage_tol(struct regulator *regulator,
-                                                     int target_uV, int tol_uV)
-{
-        return regulator_is_supported_voltage(regulator,
-                                              target_uV - tol_uV,
-                                              target_uV + tol_uV);
-}
-
 #endif
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index d10bb0f39c5..1a80bc77517 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -16,10 +16,8 @@
 #define __LINUX_REGULATOR_DRIVER_H_
 
 #include <linux/device.h>
-#include <linux/notifier.h>
 #include <linux/regulator/consumer.h>
 
-struct regmap;
 struct regulator_dev;
 struct regulator_init_data;
 
@@ -32,10 +30,6 @@ enum regulator_status {
         REGULATOR_STATUS_NORMAL,
         REGULATOR_STATUS_IDLE,
         REGULATOR_STATUS_STANDBY,
-        /* The regulator is enabled but not regulating */
-        REGULATOR_STATUS_BYPASS,
-        /* in case that any other status doesn't apply */
-        REGULATOR_STATUS_UNDEFINED,
 };
 
 /**
@@ -50,7 +44,6 @@ 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.
@@ -60,7 +53,6 @@ enum regulator_status {
  *      regulator_desc.n_voltages.  Voltages may be reported in any order.
  *
  * @set_current_limit: Configure a limit for a current-limited regulator.
- *                     The driver should select the current closest to max_uA.
  * @get_current_limit: Get the configured limit for a current-limited regulator.
  *
  * @set_mode: Set the configured operating mode for the regulator.
@@ -70,13 +62,8 @@ enum regulator_status {
  * @get_optimum_mode: Get the most efficient operating mode for the regulator
  *                    when running with the specified parameters.
  *
- * @set_bypass: Set the regulator in bypass mode.
- * @get_bypass: Get the regulator bypass mode state.
- *
  * @enable_time: Time taken for the regulator voltage output voltage to
  *               stabilise after being enabled, in microseconds.
- * @set_ramp_delay: Set the ramp delay for the regulator. The driver should
- *              select ramp delay equal to or less than(closest) ramp_delay.
  * @set_voltage_time_sel: Time taken for the regulator voltage output voltage
  *               to stabilise after being set to a new value, in microseconds.
  *               The function provides the from and to voltage selector, the
@@ -102,7 +89,6 @@ 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 *);
@@ -117,13 +103,12 @@ struct regulator_ops {
         int (*disable) (struct regulator_dev *);
         int (*is_enabled) (struct regulator_dev *);
 
-        /* get/set regulator operating mode (defined in consumer.h) */
+        /* get/set regulator operating mode (defined in regulator.h) */
         int (*set_mode) (struct regulator_dev *, unsigned int mode);
         unsigned int (*get_mode) (struct regulator_dev *);
 
         /* Time taken to enable or set voltage on the regulator */
         int (*enable_time) (struct regulator_dev *);
-        int (*set_ramp_delay) (struct regulator_dev *, int ramp_delay);
         int (*set_voltage_time_sel) (struct regulator_dev *,
                                      unsigned int old_selector,
                                      unsigned int new_selector);
@@ -139,10 +124,6 @@ struct regulator_ops {
         unsigned int (*get_optimum_mode) (struct regulator_dev *, int input_uV,
                                           int output_uV, int load_uA);
 
-        /* control and report on bypass mode */
-        int (*set_bypass)(struct regulator_dev *dev, bool enable);
-        int (*get_bypass)(struct regulator_dev *dev, bool *enable);
-
         /* the operations below are for configuration of regulator state when
          * its parent PMIC enters a global STANDBY/HIBERNATE state */
 
@@ -153,7 +134,7 @@ struct regulator_ops {
         int (*set_suspend_enable) (struct regulator_dev *);
         int (*set_suspend_disable) (struct regulator_dev *);
 
-        /* set regulator suspend operating mode (defined in consumer.h) */
+        /* set regulator suspend operating mode (defined in regulator.h) */
         int (*set_suspend_mode) (struct regulator_dev *, unsigned int mode);
 };
 
@@ -166,94 +147,27 @@ enum regulator_type {
 };
 
 /**
- * struct regulator_desc - Static regulator descriptor
+ * struct regulator_desc - Regulator descriptor
  *
- * 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.
+ * Each regulator registered with the core is described with a structure of
+ * this type.
  *
  * @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.
- *
- * @continuous_voltage_range: Indicates if the regulator can set any
- *                            voltage within constrains range.
- * @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)
- * @linear_min_sel: Minimal selector for starting linear mapping
- * @ramp_delay: Time to settle down after voltage change (unit: uV/us)
- * @volt_table: Voltage mapping table (if table based 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
- *
- * @enable_time: Time taken for initial enable of regulator (in uS).
  */
 struct regulator_desc {
         const char *name;
-        const char *supply_name;
         int id;
-        bool continuous_voltage_range;
         unsigned n_voltages;
         struct regulator_ops *ops;
         int irq;
         enum regulator_type type;
         struct module *owner;
-
-        unsigned int min_uV;
-        unsigned int uV_step;
-        unsigned int linear_min_sel;
-        unsigned int ramp_delay;
-
-        const unsigned int *volt_table;
-
-        unsigned int vsel_reg;
-        unsigned int vsel_mask;
-        unsigned int enable_reg;
-        unsigned int enable_mask;
-        unsigned int bypass_reg;
-        unsigned int bypass_mask;
-
-        unsigned int enable_time;
-};
-
-/**
- * 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 if dev_get_regulator() is
- *          insufficient.
- * @ena_gpio: GPIO controlling regulator enable.
- * @ena_gpio_invert: Sense for GPIO enable control.
- * @ena_gpio_flags: Flags to use when calling gpio_request_one()
- */
-struct regulator_config {
-        struct device *dev;
-        const struct regulator_init_data *init_data;
-        void *driver_data;
-        struct device_node *of_node;
-        struct regmap *regmap;
-
-        int ena_gpio;
-        unsigned int ena_gpio_invert:1;
-        unsigned int ena_gpio_flags;
 };
 
 /*
@@ -267,11 +181,10 @@ struct regulator_config {
  * no other direct access).
  */
 struct regulator_dev {
-        const struct regulator_desc *desc;
+        struct regulator_desc *desc;
         int exclusive;
         u32 use_count;
         u32 open_count;
-        u32 bypass_count;
 
         /* lists we belong to */
         struct list_head list; /* list of all regulators */
@@ -285,23 +198,17 @@ 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;
 
         void *reg_data;         /* regulator_dev data */
 
+#ifdef CONFIG_DEBUG_FS
         struct dentry *debugfs;
-
-        int ena_gpio;
-        unsigned int ena_gpio_invert:1;
-        unsigned int ena_gpio_state:1;
+#endif
 };
 
-struct regulator_dev *
-regulator_register(const struct regulator_desc *regulator_desc,
-                   const struct regulator_config *config);
+struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
+        struct device *dev, const struct regulator_init_data *init_data,
+        void *driver_data);
 void regulator_unregister(struct regulator_dev *rdev);
 
 int regulator_notifier_call_chain(struct regulator_dev *rdev,
@@ -313,25 +220,6 @@ 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_list_voltage_table(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);
-int regulator_set_voltage_time_sel(struct regulator_dev *rdev,
-                                   unsigned int old_selector,
-                                   unsigned int new_selector);
-int regulator_set_bypass_regmap(struct regulator_dev *rdev, bool enable);
-int regulator_get_bypass_regmap(struct regulator_dev *rdev, bool *enable);
-
 void *regulator_get_init_drvdata(struct regulator_init_data *reg_init_data);
 
 #endif
diff --git a/include/linux/regulator/fan53555.h b/include/linux/regulator/fan53555.h
deleted file mode 100644
index 5c45c85d52c..00000000000
--- a/include/linux/regulator/fan53555.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * fan53555.h - Fairchild Regulator FAN53555 Driver
- *
- * Copyright (C) 2012 Marvell Technology Ltd.
- * Yunfan Zhang <yfzhang@marvell.com>
- *
- * This package is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
-
-#ifndef __FAN53555_H__
-
-/* VSEL ID */
-enum {
-        FAN53555_VSEL_ID_0 = 0,
-        FAN53555_VSEL_ID_1,
-};
-
-/* Transition slew rate limiting from a low to high voltage.
- * -----------------------
- *   Bin |Slew Rate(mV/uS)
- * ------|----------------
- *   000 |    64.00
- * ------|----------------
- *   001 |    32.00
- * ------|----------------
- *   010 |    16.00
- * ------|----------------
- *   011 |     8.00
- * ------|----------------
- *   100 |     4.00
- * ------|----------------
- *   101 |     2.00
- * ------|----------------
- *   110 |     1.00
- * ------|----------------
- *   111 |     0.50
- * -----------------------
- */
-enum {
-        FAN53555_SLEW_RATE_64MV = 0,
-        FAN53555_SLEW_RATE_32MV,
-        FAN53555_SLEW_RATE_16MV,
-        FAN53555_SLEW_RATE_8MV,
-        FAN53555_SLEW_RATE_4MV,
-        FAN53555_SLEW_RATE_2MV,
-        FAN53555_SLEW_RATE_1MV,
-        FAN53555_SLEW_RATE_0_5MV,
-};
-
-struct fan53555_platform_data {
-        struct regulator_init_data *regulator;
-        unsigned int slew_rate;
-        /* Sleep VSEL ID */
-        unsigned int sleep_vsel_id;
-};
-
-#endif /* __FAN53555_H__ */
diff --git a/include/linux/regulator/fixed.h b/include/linux/regulator/fixed.h
index 48918be649d..ffd7d508e72 100644
--- a/include/linux/regulator/fixed.h
+++ b/include/linux/regulator/fixed.h
@@ -22,17 +22,10 @@ struct regulator_init_data;
 /**
  * struct fixed_voltage_config - fixed_voltage_config structure
  * @supply_name:        Name of the regulator supply
- * @input_supply:       Name of the input regulator supply
  * @microvolts:         Output voltage of regulator
  * @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
@@ -47,30 +40,12 @@ struct regulator_init_data;
  */
 struct fixed_voltage_config {
         const char *supply_name;
-        const char *input_supply;
         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;
 };
 
-struct regulator_consumer_supply;
-
-#if IS_ENABLED(CONFIG_REGULATOR)
-struct platform_device *regulator_register_always_on(int id, const char *name,
-                struct regulator_consumer_supply *supplies, int num_supplies, int uv);
-#else
-static inline struct platform_device *regulator_register_always_on(int id, const char *name,
-                struct regulator_consumer_supply *supplies, int num_supplies, int uv)
-{
-        return NULL;
-}
-#endif
-
-#define regulator_register_fixed(id, s, ns) regulator_register_always_on(id, \
-                                                "fixed-dummy", s, ns, 0)
-
 #endif
diff --git a/include/linux/regulator/lp872x.h b/include/linux/regulator/lp872x.h
deleted file mode 100644
index 132e05c4666..00000000000
--- a/include/linux/regulator/lp872x.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2012 Texas Instruments
- *
- * Author: Milo(Woogyom) Kim <milo.kim@ti.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
-
-#ifndef __LP872X_REGULATOR_H__
-#define __LP872X_REGULATOR_H__
-
-#include <linux/regulator/machine.h>
-#include <linux/platform_device.h>
-#include <linux/gpio.h>
-
-#define LP872X_MAX_REGULATORS           9
-
-enum lp872x_regulator_id {
-        LP8720_ID_BASE,
-        LP8720_ID_LDO1 = LP8720_ID_BASE,
-        LP8720_ID_LDO2,
-        LP8720_ID_LDO3,
-        LP8720_ID_LDO4,
-        LP8720_ID_LDO5,
-        LP8720_ID_BUCK,
-
-        LP8725_ID_BASE,
-        LP8725_ID_LDO1 = LP8725_ID_BASE,
-        LP8725_ID_LDO2,
-        LP8725_ID_LDO3,
-        LP8725_ID_LDO4,
-        LP8725_ID_LDO5,
-        LP8725_ID_LILO1,
-        LP8725_ID_LILO2,
-        LP8725_ID_BUCK1,
-        LP8725_ID_BUCK2,
-
-        LP872X_ID_MAX,
-};
-
-enum lp872x_dvs_state {
-        DVS_LOW  = GPIOF_OUT_INIT_LOW,
-        DVS_HIGH = GPIOF_OUT_INIT_HIGH,
-};
-
-enum lp872x_dvs_sel {
-        SEL_V1,
-        SEL_V2,
-};
-
-/**
- * lp872x_dvs
- * @gpio       : gpio pin number for dvs control
- * @vsel       : dvs selector for buck v1 or buck v2 register
- * @init_state : initial dvs pin state
- */
-struct lp872x_dvs {
-        int gpio;
-        enum lp872x_dvs_sel vsel;
-        enum lp872x_dvs_state init_state;
-};
-
-/**
- * lp872x_regdata
- * @id        : regulator id
- * @init_data : init data for each regulator
- */
-struct lp872x_regulator_data {
-        enum lp872x_regulator_id id;
-        struct regulator_init_data *init_data;
-};
-
-/**
- * lp872x_platform_data
- * @general_config    : the value of LP872X_GENERAL_CFG register
- * @update_config     : if LP872X_GENERAL_CFG register is updated, set true
- * @regulator_data    : platform regulator id and init data
- * @dvs               : dvs data for buck voltage control
- */
-struct lp872x_platform_data {
-        u8 general_config;
-        bool update_config;
-        struct lp872x_regulator_data regulator_data[LP872X_MAX_REGULATORS];
-        struct lp872x_dvs *dvs;
-};
-
-#endif
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h
index 36adbc82de6..ce3127a75c8 100644
--- a/include/linux/regulator/machine.h
+++ b/include/linux/regulator/machine.h
@@ -32,7 +32,6 @@ struct regulator;
  *           board/machine.
  * STATUS:   Regulator can be enabled and disabled.
  * DRMS:     Dynamic Regulator Mode Switching is enabled for this regulator.
- * BYPASS:   Regulator can be put into bypass mode
  */
 
 #define REGULATOR_CHANGE_VOLTAGE        0x1
@@ -40,7 +39,6 @@ struct regulator;
 #define REGULATOR_CHANGE_MODE           0x4
 #define REGULATOR_CHANGE_STATUS         0x8
 #define REGULATOR_CHANGE_DRMS           0x10
-#define REGULATOR_CHANGE_BYPASS         0x20
 
 /**
  * struct regulator_state - regulator state during low power system states
@@ -73,7 +71,7 @@ struct regulator_state {
  * @uV_offset: Offset applied to voltages from consumer to compensate for
  *             voltage drops.
  *
- * @min_uA: Smallest current consumers may set.
+ * @min_uA: Smallest consumers consumers may set.
  * @max_uA: Largest current consumers may set.
  *
  * @valid_modes_mask: Mask of modes which may be configured by consumers.
@@ -94,11 +92,10 @@ struct regulator_state {
  *                 mode.
  * @initial_state: Suspend state to set by default.
  * @initial_mode: Mode to set at startup.
- * @ramp_delay: Time to settle down after voltage change (unit: uV/us)
  */
 struct regulation_constraints {
 
-        const char *name;
+        char *name;
 
         /* voltage output range (inclusive) - for voltage control */
         int min_uV;
@@ -128,8 +125,6 @@ struct regulation_constraints {
         /* mode to set on startup */
         unsigned int initial_mode;
 
-        unsigned int ramp_delay;
-
         /* constraint flags */
         unsigned always_on:1;   /* regulator never off when system is on */
         unsigned boot_on:1;     /* bootloader/firmware enabled regulator */
@@ -139,13 +134,17 @@ struct regulation_constraints {
 /**
  * struct regulator_consumer_supply - supply -> device mapping
  *
- * This maps a supply name to a device. Use of dev_name allows support for
- * buses which make struct device available late such as I2C.
+ * This maps a supply name to a device.  Only one of dev or dev_name
+ * can be specified.  Use of dev_name allows support for buses which
+ * make struct device available late such as I2C and is the preferred
+ * form.
  *
+ * @dev: Device structure for the consumer.
  * @dev_name: Result of dev_name() for the consumer.
  * @supply: Name for the supply.
  */
 struct regulator_consumer_supply {
+        struct device *dev;     /* consumer */
         const char *dev_name;   /* dev_name() for consumer */
         const char *supply;     /* consumer supply - e.g. "vcc" */
 };
diff --git a/include/linux/regulator/max8973-regulator.h b/include/linux/regulator/max8973-regulator.h
deleted file mode 100644
index f8acc052e35..00000000000
--- a/include/linux/regulator/max8973-regulator.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * max8973-regulator.h -- MAXIM 8973 regulator
- *
- * Interface for regulator driver for MAXIM 8973 DC-DC step-down
- * switching regulator.
- *
- * Copyright (C) 2012 NVIDIA Corporation
-
- * Author: Laxman Dewangan <ldewangan@nvidia.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that 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, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- */
-
-#ifndef __LINUX_REGULATOR_MAX8973_H
-#define __LINUX_REGULATOR_MAX8973_H
-
-/*
- * Control flags for configuration of the device.
- * Client need to pass this information with ORed
- */
-#define MAX8973_CONTROL_REMOTE_SENSE_ENABLE                     0x00000001
-#define MAX8973_CONTROL_FALLING_SLEW_RATE_ENABLE                0x00000002
-#define MAX8973_CONTROL_OUTPUT_ACTIVE_DISCH_ENABLE              0x00000004
-#define MAX8973_CONTROL_BIAS_ENABLE                             0x00000008
-#define MAX8973_CONTROL_PULL_DOWN_ENABLE                        0x00000010
-#define MAX8973_CONTROL_FREQ_SHIFT_9PER_ENABLE                  0x00000020
-
-#define MAX8973_CONTROL_CLKADV_TRIP_DISABLED                    0x00000000
-#define MAX8973_CONTROL_CLKADV_TRIP_75mV_PER_US                 0x00010000
-#define MAX8973_CONTROL_CLKADV_TRIP_150mV_PER_US                0x00020000
-#define MAX8973_CONTROL_CLKADV_TRIP_75mV_PER_US_HIST_DIS        0x00030000
-
-#define MAX8973_CONTROL_INDUCTOR_VALUE_NOMINAL                  0x00000000
-#define MAX8973_CONTROL_INDUCTOR_VALUE_MINUS_30_PER             0x00100000
-#define MAX8973_CONTROL_INDUCTOR_VALUE_PLUS_30_PER              0x00200000
-#define MAX8973_CONTROL_INDUCTOR_VALUE_PLUS_60_PER              0x00300000
-
-/*
- * struct max8973_regulator_platform_data - max8973 regulator platform data.
- *
- * @reg_init_data: The regulator init data.
- * @control_flags: Control flags which are ORed value of above flags to
- *              configure device.
- * @enable_ext_control: Enable the voltage enable/disable through external
- *              control signal from EN input pin. If it is false then
- *              voltage output will be enabled/disabled through EN bit of
- *              device register.
- * @dvs_gpio: GPIO for dvs. It should be -1 if this is tied with fixed logic.
- * @dvs_def_state: Default state of dvs. 1 if it is high else 0.
- */
-struct max8973_regulator_platform_data {
-        struct regulator_init_data *reg_init_data;
-        unsigned long control_flags;
-        bool enable_ext_control;
-        int dvs_gpio;
-        unsigned dvs_def_state:1;
-};
-
-#endif /* __LINUX_REGULATOR_MAX8973_H */
diff --git a/include/linux/regulator/of_regulator.h b/include/linux/regulator/of_regulator.h
deleted file mode 100644
index f9217965aaa..00000000000
--- a/include/linux/regulator/of_regulator.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * OpenFirmware regulator support routines
- *
- */
-
-#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,
-                                    struct device_node *node)
-{
-        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/tps51632-regulator.h b/include/linux/regulator/tps51632-regulator.h
deleted file mode 100644
index d00841e1a75..00000000000
--- a/include/linux/regulator/tps51632-regulator.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * tps51632-regulator.h -- TPS51632 regulator
- *
- * Interface for regulator driver for TPS51632 3-2-1 Phase D-Cap Step Down
- * Driverless Controller with serial VID control and DVFS.
- *
- * Copyright (C) 2012 NVIDIA Corporation
-
- * Author: Laxman Dewangan <ldewangan@nvidia.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that 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, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- */
-
-#ifndef __LINUX_REGULATOR_TPS51632_H
-#define __LINUX_REGULATOR_TPS51632_H
-
-/*
- * struct tps51632_regulator_platform_data - tps51632 regulator platform data.
- *
- * @reg_init_data: The regulator init data.
- * @enable_pwm_dvfs: Enable PWM DVFS or not.
- * @dvfs_step_20mV: Step for DVFS is 20mV or 10mV.
- * @max_voltage_uV: Maximum possible voltage in PWM-DVFS mode.
- * @base_voltage_uV: Base voltage when PWM-DVFS enabled.
- */
-struct tps51632_regulator_platform_data {
-        struct regulator_init_data *reg_init_data;
-        bool enable_pwm_dvfs;
-        bool dvfs_step_20mV;
-        int max_voltage_uV;
-        int base_voltage_uV;
-};
-
-#endif /* __LINUX_REGULATOR_TPS51632_H */
diff --git a/include/linux/regulator/tps62360.h b/include/linux/regulator/tps62360.h
index a4c49394c49..6a5c1b2c751 100644
--- a/include/linux/regulator/tps62360.h
+++ b/include/linux/regulator/tps62360.h
@@ -26,10 +26,13 @@
 #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.
@@ -41,7 +44,8 @@
  * @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;
+        struct regulator_init_data reg_init_data;
+        bool en_force_pwm;
         bool en_discharge;
         bool en_internal_pulldn;
         int vsel0_gpio;