Pull input updates from Dmitry Torokhov: - a new driver for ADC driven joysticks - a new Zintix touchscreen driver - enhancements to Intel SoC button array driver - support for F3A "function" in Synaptics RMI4 driver - assorted driver fixups * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (29 commits) Input: Add MAINTAINERS entry for SiS i2c touch input driver Input: evdev - per-client waitgroups Input: synaptics - enable InterTouch for ThinkPad T14 Gen 1 Input: synaptics - enable InterTouch for ThinkPad P1/X1E gen 2 Input: synaptics-rmi4 - support bootloader v8 in f34v7 Input: synaptics-rmi4 - add support for F3A Input: synaptics-rmi4 - rename f30_data to gpio_data Input: add zinitix touchscreen driver dt-bindings: input/touchscreen: add bindings for zinitix Input: joystick - add ADC attached joystick driver. dt-bindings: input: Add docs for ADC driven joystick Input: sun4i-ps2 - fix handling of platform_get_irq() error Input: twl4030_keypad - fix handling of platform_get_irq() error Input: omap4-keypad - fix handling of platform_get_irq() error Input: ep93xx_keypad - fix handling of platform_get_irq() error Input: stmfts - fix a & vs && typo Input: imx6ul_tsc - unify open/close and PM paths Input: imx6ul_tsc - clean up some errors in imx6ul_tsc_resume() Input: elants_i2c - fix typo for an attribute to show calibration count Input: elants_i2c - report resolution of ABS_MT_TOUCH_MAJOR by FW information. ...
Showing the changes to include/uapi/linux (1 of 33 files). Show all
Unified · Split
| @@ -515,6 +515,9 @@ · 514 unmodified lines | |||
| 515 | #define KEY_10CHANNELSUP 0x1b8 /* 10 channels up (10+) */ | 515 | #define KEY_10CHANNELSUP 0x1b8 /* 10 channels up (10+) */ |
| 516 | #define KEY_10CHANNELSDOWN 0x1b9 /* 10 channels down (10-) */ | 516 | #define KEY_10CHANNELSDOWN 0x1b9 /* 10 channels down (10-) */ |
| 517 | #define KEY_IMAGES 0x1ba /* AL Image Browser */ | 517 | #define KEY_IMAGES 0x1ba /* AL Image Browser */ |
| 518 | #define KEY_NOTIFICATION_CENTER 0x1bc /* Show/hide the notification center */ | ||
| 519 | #define KEY_PICKUP_PHONE 0x1bd /* Answer incoming call */ | ||
| 520 | #define KEY_HANGUP_PHONE 0x1be /* Decline incoming call */ | ||
| 518 | 521 | ||
| 519 | #define KEY_DEL_EOL 0x1c0 | 522 | #define KEY_DEL_EOL 0x1c0 |
| 520 | #define KEY_DEL_EOS 0x1c1 | 523 | #define KEY_DEL_EOS 0x1c1 |
| @@ -542,6 +545,7 @@ · 21 unmodified lines | |||
| 542 | #define KEY_FN_F 0x1e2 | 545 | #define KEY_FN_F 0x1e2 |
| 543 | #define KEY_FN_S 0x1e3 | 546 | #define KEY_FN_S 0x1e3 |
| 544 | #define KEY_FN_B 0x1e4 | 547 | #define KEY_FN_B 0x1e4 |
| 548 | #define KEY_FN_RIGHT_SHIFT 0x1e5 | ||
| 545 | 549 | ||
| 546 | #define KEY_BRL_DOT1 0x1f1 | 550 | #define KEY_BRL_DOT1 0x1f1 |
| 547 | #define KEY_BRL_DOT2 0x1f2 | 551 | #define KEY_BRL_DOT2 0x1f2 |