diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-12 12:42:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-12 12:42:32 -0700 |
| commit | bae14e7a2dcb726476b5020396923a24ccc4c40b (patch) | |
| tree | 8da2102b927e14b9406db34e41b0ecc192616e2f /include | |
| parent | 171c062188c6bc6ca5d28b2a9b9acc272ac1244e (diff) | |
| parent | 43fef47f94a1ae46fb2720dada32fa3b5547bee2 (diff) | |
| download | linux-bae14e7a2dcb726476b5020396923a24ccc4c40b.tar.bz2 | |
Merge tag 'mfd-for-linus-3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull more MFD updates from Lee Jones:
"I missed collecting these patches due to a branch/tag naming
ambiguity. Completely my own fault, as I mindlessly named a branch
and tag identically. Sorry for the fuss.
This pull-request contains some misplaced patches from Tony Lindgren
that should have been part of the initial one"
* tag 'mfd-for-linus-3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
mfd: twl4030-power: Add a configuration to turn off oscillator during off-idle
mfd: twl4030-power: Add support for board specific configuration
mfd: twl4030-power: Add recommended idle configuration
mfd: twl4030-power: Add generic reset configuration
mfd: twl4030-power: Fix some defines for SW_EVENTS
mfd: twl4030-power: Fix hang on reboot if sleep configuration was loaded earlier
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/i2c/twl.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index d2b16704624c..8cfb50f38529 100644 --- 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 */ }; |