diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-12 15:42:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-12 15:42:32 -0400 |
| commit | bae14e7a2dcb726476b5020396923a24ccc4c40b (patch) | |
| tree | 8da2102b927e14b9406db34e41b0ecc192616e2f /Documentation/devicetree/bindings/mfd | |
| parent | 171c062188c6bc6ca5d28b2a9b9acc272ac1244e (diff) | |
| parent | 43fef47f94a1ae46fb2720dada32fa3b5547bee2 (diff) | |
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 'Documentation/devicetree/bindings/mfd')
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/twl4030-power.txt | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/mfd/twl4030-power.txt b/Documentation/devicetree/bindings/mfd/twl4030-power.txt index 8e15ec35ac99..b9ee7b98d3e2 100644 --- a/Documentation/devicetree/bindings/mfd/twl4030-power.txt +++ b/Documentation/devicetree/bindings/mfd/twl4030-power.txt | |||
| @@ -5,7 +5,22 @@ to control the power resources, including power scripts. For now, the | |||
| 5 | binding only supports the complete shutdown of the system after poweroff. | 5 | binding only supports the complete shutdown of the system after poweroff. |
| 6 | 6 | ||
| 7 | Required properties: | 7 | Required properties: |
| 8 | - compatible : must be "ti,twl4030-power" | 8 | - compatible : must be one of the following |
| 9 | "ti,twl4030-power" | ||
| 10 | "ti,twl4030-power-reset" | ||
| 11 | "ti,twl4030-power-idle" | ||
| 12 | "ti,twl4030-power-idle-osc-off" | ||
| 13 | |||
| 14 | The use of ti,twl4030-power-reset is recommended at least on | ||
| 15 | 3530 that needs a special configuration for warm reset to work. | ||
| 16 | |||
| 17 | When using ti,twl4030-power-idle, the TI recommended configuration | ||
| 18 | for idle modes is loaded to the tlw4030 PMIC. | ||
| 19 | |||
| 20 | When using ti,twl4030-power-idle-osc-off, the TI recommended | ||
| 21 | configuration is used with the external oscillator being shut | ||
| 22 | down during off-idle. Note that this does not work on all boards | ||
| 23 | depending on how the external oscillator is wired. | ||
| 9 | 24 | ||
| 10 | Optional properties: | 25 | Optional properties: |
| 11 | - ti,use_poweroff: With this flag, the chip will initiates an ACTIVE-to-OFF or | 26 | - ti,use_poweroff: With this flag, the chip will initiates an ACTIVE-to-OFF or |