Merge branch 'for-4.12/sony' into for-linus

mariux64 · May 2, 2017 · 800f3ee · 800f3ee
2 parents 18fc216 + 040fc00
commit 800f3ee
Show file tree

Hide file tree

Showing 3 changed files with 876 additions and 814 deletions.
diff --git 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: