diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-05-02 05:02:24 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-05-02 05:02:24 -0400 |
| commit | 800f3eef8ebc1264e9c135bfa892c8ae41fa4792 (patch) | |
| tree | cb4aa7a8a0780283b02a7c511ff41ba345cd314f /Documentation | |
| parent | 18fc2163b8a410d4d36b8f44658580731c0afaa1 (diff) | |
| parent | 040fc001765d374776353cb4f8b03ea7fa41e3cd (diff) | |
Merge branch 'for-4.12/sony' into for-linus
Diffstat (limited to 'Documentation')
| -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. | |||
| 301 | INPUT_PROP_ACCELEROMETER | 301 | INPUT_PROP_ACCELEROMETER |
| 302 | ------------------------- | 302 | ------------------------- |
| 303 | Directional axes on this device (absolute and/or relative x, y, z) represent | 303 | 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 | ||
| 305 | regular directional axes and accelerometer axes on the same event node. | 308 | regular directional axes and accelerometer axes on the same event node. |
| 306 | 309 | ||
| 307 | Guidelines: | 310 | Guidelines: |