summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorSylvain Rochet <sylvain.rochet@finsecur.com>2015-10-14 09:24:36 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2015-10-14 09:30:31 +0300
commit47ec6e5a5f57f96d7d382e2d9f8dc5a5bdb45259 (patch)
tree9acbf207521a48c882f922544f01dfc1a37ffb50 /Documentation
parent027c71bbae3a6eeff00c11d1b708593a5c790314 (diff)
downloadlinux-47ec6e5a5f57f96d7d382e2d9f8dc5a5bdb45259.tar.xz
Input: rotary_encoder - add wake up support
This patch adds wake up support to GPIO rotary encoders. Signed-off-by: Sylvain Rochet <sylvain.rochet@finsecur.com> Reviewed-by: Johan Hovold <johan@kernel.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/input/rotary-encoder.txt1
-rw-r--r--Documentation/input/rotary-encoder.txt1
2 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/input/rotary-encoder.txt b/Documentation/devicetree/bindings/input/rotary-encoder.txt
index 331549593ed5..891ddba2d792 100644
--- a/Documentation/devicetree/bindings/input/rotary-encoder.txt
+++ b/Documentation/devicetree/bindings/input/rotary-encoder.txt
@@ -15,6 +15,7 @@ Optional properties:
- rotary-encoder,rollover: Automatic rollove when the rotary value becomes
greater than the specified steps or smaller than 0. For absolute axis only.
- rotary-encoder,half-period: Makes the driver work on half-period mode.
+- wakeup-source: Boolean, rotary encoder can wake up the system.
See Documentation/input/rotary-encoder.txt for more information.
diff --git a/Documentation/input/rotary-encoder.txt b/Documentation/input/rotary-encoder.txt
index 5737e3590adb..bddbee188624 100644
--- a/Documentation/input/rotary-encoder.txt
+++ b/Documentation/input/rotary-encoder.txt
@@ -109,6 +109,7 @@ static struct rotary_encoder_platform_data my_rotary_encoder_info = {
.inverted_a = 0,
.inverted_b = 0,
.half_period = false,
+ .wakeup_source = false,
};
static struct platform_device rotary_encoder_device = {