Pull input fixes from Dmitry Torokhov: - a fix to generate proper timestamps on key autorepeat events that were broken recently - a fix for Synaptics driver to only activate reduced reporting mode when explicitly requested - a new keycode for "selective screenshot" function - other assorted fixes * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: fix stale timestamp on key autorepeat events Input: move the new KEY_SELECTIVE_SCREENSHOT keycode Input: avoid BIT() macro usage in the serio.h UAPI header Input: synaptics-rmi4 - set reduced reporting mode only when requested Input: synaptics - enable RMI on HP Envy 13-ad105ng Input: allocate keycode for "Selective Screenshot" key Input: tm2-touchkey - add support for Coreriver TC360 variant dt-bindings: input: add Coreriver TC360 binding dt-bindings: vendor-prefixes: Add Coreriver vendor prefix Input: raydium_i2c_ts - fix error codes in raydium_i2c_boot_trigger()
Showing the changes to include/uapi/linux (2 of 9 files). Show all
Unified · Split
| @@ -652,6 +652,9 @@ · 651 unmodified lines | |||
| 652 | /* Electronic privacy screen control */ | 652 | /* Electronic privacy screen control */ |
| 653 | #define KEY_PRIVACY_SCREEN_TOGGLE 0x279 | 653 | #define KEY_PRIVACY_SCREEN_TOGGLE 0x279 |
| 654 | 654 | ||
| 655 | /* Select an area of screen to be copied */ | ||
| 656 | #define KEY_SELECTIVE_SCREENSHOT 0x27a | ||
| 657 | |||
| 655 | /* | 658 | /* |
| 656 | * Some keyboards have keys which do not have a defined meaning, these keys | 659 | * Some keyboards have keys which do not have a defined meaning, these keys |
| 657 | * are intended to be programmed / bound to macros by the user. For most | 660 | * are intended to be programmed / bound to macros by the user. For most |
| @@ -9,7 +9,7 @@ · 8 unmodified lines | |||
| 9 | #ifndef _UAPI_SERIO_H | 9 | #ifndef _UAPI_SERIO_H |
| 10 | #define _UAPI_SERIO_H | 10 | #define _UAPI_SERIO_H |
| 11 | 11 | ||
| 12 | 12 | #include <linux/const.h> | |
| 13 | #include <linux/ioctl.h> | 13 | #include <linux/ioctl.h> |
| 14 | 14 | ||
| 15 | #define SPIOCSTYPE _IOW('q', 0x01, unsigned long) | 15 | #define SPIOCSTYPE _IOW('q', 0x01, unsigned long) |
| @@ -18,10 +18,10 @@ · 2 unmodified lines | |||
| 18 | /* | 18 | /* |
| 19 | * bit masks for use in "interrupt" flags (3rd argument) | 19 | * bit masks for use in "interrupt" flags (3rd argument) |
| 20 | */ | 20 | */ |
| 21 | #define SERIO_TIMEOUT BIT(0) | 21 | #define SERIO_TIMEOUT _BITUL(0) |
| 22 | #define SERIO_PARITY BIT(1) | 22 | #define SERIO_PARITY _BITUL(1) |
| 23 | #define SERIO_FRAME BIT(2) | 23 | #define SERIO_FRAME _BITUL(2) |
| 24 | #define SERIO_OOB_DATA BIT(3) | 24 | #define SERIO_OOB_DATA _BITUL(3) |
| 25 | 25 | ||
| 26 | /* | 26 | /* |
| 27 | * Serio types | 27 | * Serio types |