Skip to content

Commit 800f3ee

Browse files
author
Jiri Kosina
committed
Merge branch 'for-4.12/sony' into for-linus
2 parents 18fc216 + 040fc00 commit 800f3ee

3 files changed

Lines changed: 876 additions & 814 deletions

File tree

Documentation/input/event-codes.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,10 @@ them as any other INPUT_PROP_BUTTONPAD device.
301301
INPUT_PROP_ACCELEROMETER
302302
-------------------------
303303
Directional axes on this device (absolute and/or relative x, y, z) represent
304-
accelerometer data. All other axes retain their meaning. A device must not mix
304+
accelerometer data. Some devices also report gyroscope data, which devices
305+
can report through the rotational axes (absolute and/or relative rx, ry, rz).
306+
307+
All other axes retain their meaning. A device must not mix
305308
regular directional axes and accelerometer axes on the same event node.
306309

307310
Guidelines:

0 commit comments

Comments
 (0)