Pull input updates from Dmitry Torokhov: "Assorted fixes and cleanups to the existing drivers plus a new driver for IMS Passenger Control Unit device they use for ther in-flight entertainment system." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (44 commits) Input: trackpoint - Optimize trackpoint init to use power-on reset Input: apbps2 - convert to devm_ioremap_resource() Input: ALPS - use %ph to print buffers ARM - shmobile: Armadillo800EVA: Move st1232 reset pin handling Input: st1232 - add reset pin handling Input: st1232 - convert to devm_* infrastructure Input: MT - handle semi-mt devices in core Input: adxl34x - use spi_get_drvdata() Input: ad7877 - use spi_get_drvdata() and spi_set_drvdata() Input: ads7846 - use spi_get_drvdata() and spi_set_drvdata() Input: ims-pcu - fix a memory leak on error Input: sysrq - supplement reset sequence with timeout functionality Input: tegra-kbc - support for defining row/columns based on SoC Input: imx_keypad - switch to using managed resources Input: arc_ps2 - add support for device tree Input: mma8450 - fix signed 12bits to 32bits conversion Input: eeti_ts - remove redundant null check Input: edt-ft5x06 - remove redundant null check before kfree Input: ad714x - add CONFIG_PM_SLEEP to suspend/resume functions Input: adxl34x - add CONFIG_PM_SLEEP to suspend/resume functions ...
Showing the changes to include/uapi/linux (1 of 49 files). Show all
Unified · Split
| @@ -702,6 +702,11 @@ struct input_keymap_entry { · 701 unmodified lines | |||
| 702 | #define KEY_CAMERA_LEFT 0x219 | 702 | #define KEY_CAMERA_LEFT 0x219 |
| 703 | #define KEY_CAMERA_RIGHT 0x21a | 703 | #define KEY_CAMERA_RIGHT 0x21a |
| 704 | 704 | ||
| 705 | #define KEY_ATTENDANT_ON 0x21b | ||
| 706 | #define KEY_ATTENDANT_OFF 0x21c | ||
| 707 | #define KEY_ATTENDANT_TOGGLE 0x21d /* Attendant call on or off */ | ||
| 708 | #define KEY_LIGHTS_TOGGLE 0x21e /* Reading light on or off */ | ||
| 709 | |||
| 705 | #define BTN_TRIGGER_HAPPY 0x2c0 | 710 | #define BTN_TRIGGER_HAPPY 0x2c0 |
| 706 | #define BTN_TRIGGER_HAPPY1 0x2c0 | 711 | #define BTN_TRIGGER_HAPPY1 0x2c0 |
| 707 | #define BTN_TRIGGER_HAPPY2 0x2c1 | 712 | #define BTN_TRIGGER_HAPPY2 0x2c1 |