diff options
| author | Arnd Bergmann | 2014-03-17 11:14:34 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2014-03-17 11:14:34 +0100 |
| commit | cda88c8be59128da05d7cd58f9ce2754a1416516 (patch) | |
| tree | b0af393c68b3d53fcdb100b8cb07af884bd3d4d5 /Documentation | |
| parent | Merge tag 'socfpga_updates_for_3.15_v2' of git://git.rocketboards.org/linux-s... (diff) | |
| parent | Power: Reset: Generalize qnap-poweroff to work on Synology devices. (diff) | |
| download | kernel-qcow2-linux-cda88c8be59128da05d7cd58f9ce2754a1416516.tar.gz kernel-qcow2-linux-cda88c8be59128da05d7cd58f9ce2754a1416516.tar.xz kernel-qcow2-linux-cda88c8be59128da05d7cd58f9ce2754a1416516.zip | |
Merge tag 'mvebu-drivers-3.15-2' of git://git.infradead.org/linux-mvebu into next/drivers
Merge "mvebu drivers for v3.15" from Jason Cooper:
pull request #1:
- mvebu mbus
- use of_find_matching_node_and_match
- rtc
- use PTR_ERR_OR_ZERO in isl12057
- work around issue in mv where date returned is 2038
- kirkwood -> mach-mvebu
- various Kconfig oneliners to allow building kirkwood in -mvebu/
pull request #2:
- reset
- re-use qnap-poweroff driver for Synology NASs
* tag 'mvebu-drivers-3.15-2' of git://git.infradead.org/linux-mvebu:
Power: Reset: Generalize qnap-poweroff to work on Synology devices.
drivers: Enable building of Kirkwood drivers for mach-mvebu
rtc: mv: reset date if after year 2038
rtc: isl12057: use PTR_ERR_OR_ZERO to fix coccinelle warnings
bus: mvebu-mbus: make use of of_find_matching_node_and_match
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt b/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt index 0347d8350d94..af25e77c0e0c 100644 --- a/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt +++ b/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt @@ -6,8 +6,11 @@ Orion5x SoCs. Sending the character 'A', at 19200 baud, tells the microcontroller to turn the power off. This driver adds a handler to pm_power_off which is called to turn the power off. +Synology NAS devices use a similar scheme, but a different baud rate, +9600, and a different character, '1'. + Required Properties: -- compatible: Should be "qnap,power-off" +- compatible: Should be "qnap,power-off" or "synology,power-off" - reg: Address and length of the register set for UART1 - clocks: tclk clock |