Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6

[firefly-linux-kernel-4.4.55.git] / include / linux / mfd / max8998.h

diff --git a/include/linux/mfd/max8998.h b/include/linux/mfd/max8998.h
index 6823548d0c0a5e919446785e46d260d861a10cca..e3956a654cbcfe8122a3a8ed0976eba4d7430df5 100644 (file)
--- a/include/linux/mfd/max8998.h
+++ b/include/linux/mfd/max8998.h
@@ -58,10 +58,12 @@ enum {
  * max8998_regulator_data - regulator data
  * @id: regulator id
  * @initdata: regulator init data (contraints, supplies, ...)
+ * @reg_node: DT node of regulator (unused on non-DT platforms)
  */
 struct max8998_regulator_data {
        int                             id;
        struct regulator_init_data      *initdata;
+       struct device_node              *reg_node;
 };
 
 /**
@@ -73,12 +75,8 @@ struct max8998_regulator_data {
  * @buck_voltage_lock: Do NOT change the values of the following six
  *   registers set by buck?_voltage?. The voltage of BUCK1/2 cannot
  *   be other than the preset values.
- * @buck1_voltage1: BUCK1 DVS mode 1 voltage register
- * @buck1_voltage2: BUCK1 DVS mode 2 voltage register
- * @buck1_voltage3: BUCK1 DVS mode 3 voltage register
- * @buck1_voltage4: BUCK1 DVS mode 4 voltage register
- * @buck2_voltage1: BUCK2 DVS mode 1 voltage register
- * @buck2_voltage2: BUCK2 DVS mode 2 voltage register
+ * @buck1_voltage: BUCK1 DVS mode 1 voltage registers
+ * @buck2_voltage: BUCK2 DVS mode 2 voltage registers
  * @buck1_set1: BUCK1 gpio pin 1 to set output voltage
  * @buck1_set2: BUCK1 gpio pin 2 to set output voltage
  * @buck1_default_idx: Default for BUCK1 gpio pin 1, 2
@@ -100,15 +98,11 @@ struct max8998_regulator_data {
 struct max8998_platform_data {
        struct max8998_regulator_data   *regulators;
        int                             num_regulators;
-       int                             irq_base;
+       unsigned int                    irq_base;
        int                             ono;
        bool                            buck_voltage_lock;
-       int                             buck1_voltage1;
-       int                             buck1_voltage2;
-       int                             buck1_voltage3;
-       int                             buck1_voltage4;
-       int                             buck2_voltage1;
-       int                             buck2_voltage2;
+       int                             buck1_voltage[4];
+       int                             buck2_voltage[2];
        int                             buck1_set1;
        int                             buck1_set2;
        int                             buck1_default_idx;