Merge tag 'mfd-for-linus-3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / include / linux / i2c / twl.h

diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index d2b16704624c6c6122a09457e00ef716ef8d0393..8cfb50f385299820d40a0bd193a60348713945ba 100644 (file)
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -498,7 +498,10 @@ static inline int twl6030_mmc_card_detect(struct device *dev, int slot)
 #define RES_GRP_ALL            0x7     /* All resource groups */
 
 #define RES_TYPE2_R0           0x0
+#define RES_TYPE2_R1           0x1
+#define RES_TYPE2_R2           0x2
 
+#define RES_TYPE_R0            0x0
 #define RES_TYPE_ALL           0x7
 
 /* Resource states */
@@ -671,6 +674,7 @@ struct twl4030_power_data {
        struct twl4030_script **scripts;
        unsigned num;
        struct twl4030_resconfig *resource_config;
+       struct twl4030_resconfig *board_config;
 #define TWL4030_RESCONFIG_UNDEF        ((u8)-1)
        bool use_poweroff;      /* Board is wired for TWL poweroff */
 };