diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/mfd/tps6591x.h | 20 | ||||
-rw-r--r-- | include/linux/regulator/tps6591x-regulator.h | 17 |
2 files changed, 20 insertions, 17 deletions
diff --git a/include/linux/mfd/tps6591x.h b/include/linux/mfd/tps6591x.h index 2ecbedb6769b..8470c371e877 100644 --- a/include/linux/mfd/tps6591x.h +++ b/include/linux/mfd/tps6591x.h @@ -25,23 +25,6 @@ #include <linux/rtc.h> -#define tps6591x_rails(_name) "tps6591x_"#_name - -enum { - TPS6591X_ID_VIO, - TPS6591X_ID_VDD_1, - TPS6591X_ID_VDD_2, - TPS6591X_ID_VDDCTRL, - TPS6591X_ID_LDO_1, - TPS6591X_ID_LDO_2, - TPS6591X_ID_LDO_3, - TPS6591X_ID_LDO_4, - TPS6591X_ID_LDO_5, - TPS6591X_ID_LDO_6, - TPS6591X_ID_LDO_7, - TPS6591X_ID_LDO_8, -}; - enum { TPS6591X_INT_PWRHOLD_F, TPS6591X_INT_VMBHI, @@ -61,6 +44,9 @@ enum { TPS6591X_INT_VMBCH2_H, TPS6591X_INT_VMBCH2_L, TPS6591X_INT_PWRDN, + + /* Last entry */ + TPS6591X_INT_NR, }; struct tps6591x_subdev_info { diff --git a/include/linux/regulator/tps6591x-regulator.h b/include/linux/regulator/tps6591x-regulator.h index 8d2801bbcf17..150d17707fcb 100644 --- a/include/linux/regulator/tps6591x-regulator.h +++ b/include/linux/regulator/tps6591x-regulator.h @@ -26,6 +26,23 @@ #include <linux/regulator/machine.h> +#define tps6591x_rails(_name) "tps6591x_"#_name + +enum { + TPS6591X_ID_VIO, + TPS6591X_ID_VDD_1, + TPS6591X_ID_VDD_2, + TPS6591X_ID_VDDCTRL, + TPS6591X_ID_LDO_1, + TPS6591X_ID_LDO_2, + TPS6591X_ID_LDO_3, + TPS6591X_ID_LDO_4, + TPS6591X_ID_LDO_5, + TPS6591X_ID_LDO_6, + TPS6591X_ID_LDO_7, + TPS6591X_ID_LDO_8, +}; + enum tps6591x_ext_control { EXT_CTRL_NONE = 0x0, EXT_CTRL_EN1, |