diff options
author | 2017-05-02 11:02:24 +0200 | |
---|---|---|
committer | 2017-05-02 11:02:24 +0200 | |
commit | 800f3eef8ebc1264e9c135bfa892c8ae41fa4792 (patch) | |
tree | cb4aa7a8a0780283b02a7c511ff41ba345cd314f /Documentation/input | |
parent | Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2... (diff) | |
parent | HID: sony: remove redundant check for -ve err (diff) | |
download | linux-800f3eef8ebc1264e9c135bfa892c8ae41fa4792.tar.gz linux-800f3eef8ebc1264e9c135bfa892c8ae41fa4792.tar.bz2 linux-800f3eef8ebc1264e9c135bfa892c8ae41fa4792.zip |
Merge branch 'for-4.12/sony' into for-linus
Diffstat (limited to 'Documentation/input')
-rw-r--r-- | Documentation/input/event-codes.txt | 5 |
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: |