diff options
author | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-11 10:41:07 +0300 |
---|---|---|
committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-13 08:17:18 +0300 |
commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt | |
parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt')
-rw-r--r-- | kernel/Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt b/kernel/Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt index ead641c65..d0ea09ba2 100644 --- a/kernel/Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt +++ b/kernel/Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt @@ -19,7 +19,8 @@ Required Properties: Optional Properties: - linux,no-autorepeat: do no enable autorepeat feature. -- linux,wakeup: use any event on keypad as wakeup event. +- wakeup-source: use any event on keypad as wakeup event. + (Legacy property supported: "linux,wakeup") - debounce-delay-ms: debounce interval in milliseconds - col-scan-delay-us: delay, measured in microseconds, that is needed before we can scan keypad after activating column gpio |