Pull input updates from Dmitry Torokhov: - big update to Wacom driver by Benjamin Tissoires, converting it to HID infrastructure and unifying USB and Bluetooth models - large update to ALPS driver by Hans de Goede, which adds support for newer touchpad models as well as cleans up and restructures the code - more changes to Atmel MXT driver, including device tree support - new driver for iPaq x3xxx touchscreen - driver for serial Wacom tablets - driver for Microchip's CAP1106 - assorted cleanups and improvements to existing drover and input core * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (93 commits) Input: wacom - update the ABI doc according to latest changes Input: wacom - only register once the MODULE_* macros Input: HID - remove hid-wacom Bluetooth driver Input: wacom - add copyright note and bump version to 2.0 Input: wacom - remove passing id for wacom_set_report Input: wacom - check for bluetooth protocol while setting OLEDs Input: wacom - handle Intuos 4 BT in wacom.ko Input: wacom - handle Graphire BT tablets in wacom.ko Input: wacom - prepare the driver to include BT devices Input: hyperv-keyboard - register as a wakeup source Input: imx_keypad - remove ifdef round PM methods Input: jornada720_ts - get rid of space indentation and use tab Input: jornada720_ts - switch to using managed resources Input: alps - Rushmore and v7 resolution support Input: mcs5000_ts - remove ifdef around power management methods Input: mcs5000_ts - protect PM functions with CONFIG_PM_SLEEP Input: ads7846 - release resources on failure for clean exit Input: wacom - add support for 0x12C ISDv4 sensor Input: atmel_mxt_ts - use deep sleep mode when stopped ARM: dts: am437x-gp-evm: Update binding for touchscreen size ...
Showing the changes to include/uapi/linux (2 of 48 files). Show all
Unified · Split
| @@ -76,5 +76,6 @@ · 75 unmodified lines | ||
| 76 | 76 | #define SERIO_HAMPSHIRE 0x3b |
| 77 | 77 | #define SERIO_PS2MULT 0x3c |
| 78 | 78 | #define SERIO_TSC40 0x3d |
| 79 | +#define SERIO_WACOM_IV 0x3e | |
| 79 | 80 | |
| 80 | 81 | #endif /* _UAPI_SERIO_H */ |
| @@ -84,6 +84,15 @@ struct uinput_ff_erase { · 83 unmodified lines | ||
| 84 | 84 | */ |
| 85 | 85 | #define UI_GET_SYSNAME(len) _IOC(_IOC_READ, UINPUT_IOCTL_BASE, 300, len) |
| 86 | 86 | |
| 87 | +/** | |
| 88 | + * UI_GET_VERSION - Return version of uinput protocol | |
| 89 | + * | |
| 90 | + * This writes uinput protocol version implemented by the kernel into | |
| 91 | + * the integer pointed to by the ioctl argument. The protocol version | |
| 92 | + * is hard-coded in the kernel and is independent of the uinput device. | |
| 93 | + */ | |
| 94 | +#define UI_GET_VERSION _IOR(UINPUT_IOCTL_BASE, 301, unsigned int) | |
| 95 | + | |
| 87 | 96 | /* |
| 88 | 97 | * To write a force-feedback-capable driver, the upload_effect |
| 89 | 98 | * and erase_effect callbacks in input_dev must be implemented. |