Merge 'input' from https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git (next) Merged-SHA: d4579af29e67ca8722db0a1194227f8015c8981d .../bindings/input/touchscreen/st,stmfts.yaml | 4 + .../input/touchscreen/wacom,w9007a-lt03.yaml | 73 ++++ Documentation/input/userio.rst | 25 +- MAINTAINERS | 2 +- drivers/input/joystick/adafruit-seesaw.c | 2 +- drivers/input/joystick/as5011.c | 2 +- drivers/input/joystick/qwiic-joystick.c | 2 +- drivers/input/keyboard/adp5588-keys.c | 4 +- drivers/input/keyboard/cap11xx.c | 14 +- drivers/input/keyboard/cypress-sf.c | 2 +- drivers/input/keyboard/dlink-dir685-touchkeys.c | 2 +- drivers/input/keyboard/lm8323.c | 4 +- drivers/input/keyboard/lm8333.c | 2 +- drivers/input/keyboard/max7359_keypad.c | 2 +- drivers/input/keyboard/mpr121_touchkey.c | 2 +- drivers/input/keyboard/qt1070.c | 2 +- drivers/input/keyboard/qt2160.c | 2 +- drivers/input/keyboard/tca8418_keypad.c | 2 +- drivers/input/keyboard/tm2-touchkey.c | 2 +- drivers/input/misc/Kconfig | 10 - drivers/input/misc/Makefile | 1 - drivers/input/misc/ad714x-i2c.c | 10 +- drivers/input/misc/adxl34x-i2c.c | 2 +- drivers/input/misc/apanel.c | 2 +- drivers/input/misc/atlas_btns.c | 109 ++--- drivers/input/misc/atmel_captouch.c | 2 +- drivers/input/misc/bma150.c | 6 +- drivers/input/misc/cma3000_d0x_i2c.c | 2 +- drivers/input/misc/da7280.c | 2 +- drivers/input/misc/drv260x.c | 8 +- drivers/input/misc/drv2665.c | 2 +- drivers/input/misc/drv2667.c | 2 +- drivers/input/misc/ims-pcu.c | 131 +++++- drivers/input/misc/kxtj9.c | 2 +- drivers/input/misc/mma8450.c | 2 +- drivers/input/misc/pcap_keys.c | 125 ------ drivers/input/misc/pcf8574_keypad.c | 2 +- drivers/input/mouse/cyapa.c | 2 +- drivers/input/mouse/elan_i2c_core.c | 2 +- drivers/input/mouse/synaptics_i2c.c | 2 +- drivers/input/rmi4/rmi_i2c.c | 2 +- drivers/input/rmi4/rmi_smbus.c | 2 +- drivers/input/serio/Kconfig | 10 - drivers/input/serio/Makefile | 1 - drivers/input/serio/apbps2.c | 7 +- drivers/input/serio/userio.c | 34 +- drivers/input/serio/xilinx_ps2.c | 363 ----------------- drivers/input/touchscreen/Kconfig | 22 +- drivers/input/touchscreen/Makefile | 2 +- drivers/input/touchscreen/ad7879-i2c.c | 4 +- drivers/input/touchscreen/ar1021_i2c.c | 2 +- drivers/input/touchscreen/atmel_mxt_ts.c | 23 +- drivers/input/touchscreen/auo-pixcir-ts.c | 2 +- drivers/input/touchscreen/bu21013_ts.c | 2 +- drivers/input/touchscreen/bu21029_ts.c | 2 +- drivers/input/touchscreen/cy8ctma140.c | 2 +- drivers/input/touchscreen/cy8ctmg110_ts.c | 2 +- drivers/input/touchscreen/cyttsp5.c | 2 +- drivers/input/touchscreen/cyttsp_i2c.c | 2 +- drivers/input/touchscreen/eeti_ts.c | 2 +- drivers/input/touchscreen/egalax_ts.c | 2 +- drivers/input/touchscreen/elants_i2c.c | 6 +- drivers/input/touchscreen/exc3000.c | 8 +- drivers/input/touchscreen/goodix.c | 2 +- drivers/input/touchscreen/hideep.c | 2 +- drivers/input/touchscreen/himax_hx83112b.c | 4 +- drivers/input/touchscreen/hynitron-cst816x.c | 2 +- drivers/input/touchscreen/ili210x.c | 8 +- drivers/input/touchscreen/ilitek_ts_i2c.c | 2 +- drivers/input/touchscreen/iqs5xx.c | 6 +- drivers/input/touchscreen/max11801_ts.c | 2 +- drivers/input/touchscreen/melfas_mip4.c | 2 +- drivers/input/touchscreen/migor_ts.c | 2 +- drivers/input/touchscreen/mms114.c | 2 +- drivers/input/touchscreen/novatek-nvt-ts.c | 4 +- drivers/input/touchscreen/pcap_ts.c | 252 ------------ drivers/input/touchscreen/pixcir_i2c_ts.c | 4 +- drivers/input/touchscreen/raydium_i2c_ts.c | 4 +- drivers/input/touchscreen/rohm_bu21023.c | 2 +- drivers/input/touchscreen/s6sy761.c | 2 +- drivers/input/touchscreen/silead.c | 12 +- drivers/input/touchscreen/sis_i2c.c | 4 +- drivers/input/touchscreen/st1232.c | 4 +- drivers/input/touchscreen/stmfts.c | 162 +++++--- drivers/input/touchscreen/tsc2004.c | 2 +- drivers/input/touchscreen/tsc2007_core.c | 8 +- drivers/input/touchscreen/wacom_i2c.c | 2 +- drivers/input/touchscreen/wacom_w9000.c | 444 +++++++++++++++++++++ drivers/input/touchscreen/wdt87xx_i2c.c | 2 +- drivers/input/touchscreen/zet6223.c | 2 +- drivers/input/touchscreen/zforce_ts.c | 2 +- include/uapi/linux/userio.h | 7 +- 92 files changed, 996 insertions(+), 1037 deletions(-)