diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-28 10:39:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-28 10:39:43 -0800 |
| commit | e04d368f47d1ae84a498f659a13720ee83e9f2f9 (patch) | |
| tree | 9411352cb4b04f0bb69402387cd5c1ae2098e846 /Documentation/devicetree/bindings/power | |
| parent | Merge branch 'fixes-v4.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security (diff) | |
| parent | dt-bindings: power: Fix "debounce-interval" property misspelling (diff) | |
| download | linux-dev-e04d368f47d1ae84a498f659a13720ee83e9f2f9.tar.xz linux-dev-e04d368f47d1ae84a498f659a13720ee83e9f2f9.zip | |
Merge tag 'devicetree-fixes-for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull DeviceTree fixes from Rob Herring:
- update i.MX thermal binding example to use current binding, not the
deprecated one
- move arm-charlcd to auxdisplay/
- fix misspelling of "debounce-interval"
* tag 'devicetree-fixes-for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
dt-bindings: power: Fix "debounce-interval" property misspelling
auxdisplay: Move arm-charlcd binding to correct folder
dt-bindings: thermal: imx: update the binding to new method
Diffstat (limited to 'Documentation/devicetree/bindings/power')
| -rw-r--r-- | Documentation/devicetree/bindings/power/wakeup-source.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/power/wakeup-source.txt b/Documentation/devicetree/bindings/power/wakeup-source.txt index 3c81f78b5c27..5d254ab13ebf 100644 --- a/Documentation/devicetree/bindings/power/wakeup-source.txt +++ b/Documentation/devicetree/bindings/power/wakeup-source.txt @@ -60,7 +60,7 @@ Examples #size-cells = <0>; button@1 { - debounce_interval = <50>; + debounce-interval = <50>; wakeup-source; linux,code = <116>; label = "POWER"; |