Merge tag 'nfs-for-4.2-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[firefly-linux-kernel-4.4.55.git] / include / linux / regulator / max8973-regulator.h

diff --git a/include/linux/regulator/max8973-regulator.h b/include/linux/regulator/max8973-regulator.h
index f8acc052e35326ebc818809bc921896c81c7fd02..f6a8a16a0d4deb27dc232f782a13453a5ba73ce0 100644 (file)
--- a/include/linux/regulator/max8973-regulator.h
+++ b/include/linux/regulator/max8973-regulator.h
@@ -58,6 +58,9 @@
  *             control signal from EN input pin. If it is false then
  *             voltage output will be enabled/disabled through EN bit of
  *             device register.
+ * @enable_gpio: Enable GPIO. If EN pin is controlled through GPIO from host
+ *             then GPIO number can be provided. If no GPIO controlled then
+ *             it should be -1.
  * @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.
  */
@@ -65,6 +68,7 @@ struct max8973_regulator_platform_data {
        struct regulator_init_data *reg_init_data;
        unsigned long control_flags;
        bool enable_ext_control;
+       int enable_gpio;
        int dvs_gpio;
        unsigned dvs_def_state:1;
 };