regulator: Support voltage offsets to compensate for drops in system

[mv-sheeva.git] / include / linux / regulator / machine.h

diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h
index c4c4fc45f856ee7ee57b4a9234827aafa3242f61..ce3127a75c8866a27afeeb875bd5943c2dc61976 100644 (file)
--- a/include/linux/regulator/machine.h
+++ b/include/linux/regulator/machine.h
@@ -68,6 +68,8 @@ struct regulator_state {
  *
  * @min_uV: Smallest voltage consumers may set.
  * @max_uV: Largest voltage consumers may set.
+ * @uV_offset: Offset applied to voltages from consumer to compensate for
+ *             voltage drops.
  *
  * @min_uA: Smallest consumers consumers may set.
  * @max_uA: Largest current consumers may set.
@@ -99,6 +101,8 @@ struct regulation_constraints {
        int min_uV;
        int max_uV;
 
+       int uV_offset;
+
        /* current output range (inclusive) - for current control */
        int min_uA;
        int max_uA;
@@ -160,8 +164,6 @@ struct regulator_consumer_supply {
  * @supply_regulator: Parent regulator.  Specified using the regulator name
  *                    as it appears in the name field in sysfs, which can
  *                    be explicitly set using the constraints field 'name'.
- * @supply_regulator_dev: Parent regulator (if any) - DEPRECATED in favour
- *                        of supply_regulator.
  *
  * @constraints: Constraints.  These must be specified for the regulator to
  *               be usable.
@@ -173,7 +175,6 @@ struct regulator_consumer_supply {
  */
 struct regulator_init_data {
        const char *supply_regulator;        /* or NULL for system supply */
-       struct device *supply_regulator_dev; /* or NULL for system supply */
 
        struct regulation_constraints constraints;