summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2017-05-02 12:02:24 +0300
committerJiri Kosina <jkosina@suse.cz>2017-05-02 12:02:24 +0300
commit800f3eef8ebc1264e9c135bfa892c8ae41fa4792 (patch)
treecb4aa7a8a0780283b02a7c511ff41ba345cd314f /Documentation
parent18fc2163b8a410d4d36b8f44658580731c0afaa1 (diff)
parent040fc001765d374776353cb4f8b03ea7fa41e3cd (diff)
downloadlinux-800f3eef8ebc1264e9c135bfa892c8ae41fa4792.tar.xz
Merge branch 'for-4.12/sony' into for-linus
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/input/event-codes.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/input/event-codes.txt b/Documentation/input/event-codes.txt
index 36ea940e5bb9..575415f4cef0 100644
--- a/Documentation/input/event-codes.txt
+++ b/Documentation/input/event-codes.txt
@@ -301,7 +301,10 @@ them as any other INPUT_PROP_BUTTONPAD device.
INPUT_PROP_ACCELEROMETER
-------------------------
Directional axes on this device (absolute and/or relative x, y, z) represent
-accelerometer data. All other axes retain their meaning. A device must not mix
+accelerometer data. Some devices also report gyroscope data, which devices
+can report through the rotational axes (absolute and/or relative rx, ry, rz).
+
+All other axes retain their meaning. A device must not mix
regular directional axes and accelerometer axes on the same event node.
Guidelines: