Hi Linus,
Please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git for-linus
to receive updates for the input subsystem. Just one new driver (Cypress
StreetFighter touchkey), and no input core changes this time, plus fixes
and enhancements to existing drivers.
You will get a merge conflict, please remove
Documentation/devicetree/bindings/input/cap11xx.txt
and edit Documentation/devicetree/bindings/input/microchip,cap11xx.yaml
as follows:
diff --git a/Documentation/devicetree/bindings/input/microchip,cap11xx.yaml b/Documentation/devicetree/bindings/input/microchip,cap11xx.yaml
index fa0f37a90ac9..d5d6bced3148 100644
--- a/Documentation/devicetree/bindings/input/microchip,cap11xx.yaml
+++ b/Documentation/devicetree/bindings/input/microchip,cap11xx.yaml
@@ -19,6 +19,7 @@ properties:
- microchip,cap1106
- microchip,cap1126
- microchip,cap1188
+ - microchip,cap1206
reg:
maxItems: 1
Changelog:
---------
Alistair Francis (1):
Input: wacom_i2c - use macros for the bit masks
Arnd Bergmann (1):
Input: analog - fix invalid snprintf() call
Arvind Yadav (1):
Input: palmas-pwrbutton - handle return value of platform_get_irq()
Cai Huoqing (3):
Input: elants_i2c - make use of devm_add_action_or_reset()
Input: raydium_i2c_ts - make use of the helper function devm_add_action_or_reset()
Input: mpr121 - make use of the helper function devm_add_action_or_reset()
Colin Ian King (1):
Input: tmdc - fix spelling mistake "Millenium" -> "Millennium"
Daniel Mack (3):
Input: ads7846 - add short-hand for spi->dev in probe() function
Input: ads7846 - remove custom filter handling functions from pdata
Input: ads7846 - switch to devm initialization
Dmitry Torokhov (9):
Input: ep93xx_keypad - annotate suspend/resume as __maybe_unused
Input: ep93xx_keypad - use BIT() and GENMASK() macros
Input: ep93xx_keypad - use dev_pm_set_wake_irq()
Input: ep93xx_keypad - switch to using managed resources
Input: adxl34x - fix sparse warning
Input: ads7846 - set input device bus type and product ID
Input: ads7846 - use input_set_capability()
Input: ads7846 - do not attempt IRQ workaround when deferring probe
Input: cpcap-pwrbutton - do not set input parent explicitly
Hans de Goede (6):
Input: goodix - change goodix_i2c_write() len parameter type to int
Input: goodix - add a goodix.h header file
Input: goodix - refactor reset handling
Input: goodix - push error logging up into i2c_read and i2c_write helpers
Input: goodix - allow specifying the config filename
Input: goodix - add support for controllers without flash
Jesse Taube (1):
Input: cap11xx - add support for cap1206
Johan Hovold (1):
Input: iforce - fix control-message timeout
John Keeping (2):
Input: st1232 - increase "wait ready" timeout
Input: st1232 - prefer asynchronous probing
Jonathan Corbet (1):
Input: remove unused header <linux/input/cy8ctmg110_pdata.h>
Krzysztof Kozlowski (1):
Input: max77693-haptic - drop unneeded MODULE_ALIAS
Len Baker (1):
Input: omap-keypad - prefer struct_size over open coded arithmetic
Loic Poulain (1):
Input: synaptics-rmi4 - Fix device hierarchy
Lukas Bulwahn (1):
MAINTAINERS: rectify entry for CHIPONE ICN8318 I2C TOUCHSCREEN DRIVER
Marek Vasut (6):
Input: ili210x - use resolution from ili251x firmware
Input: ili210x - export ili251x version details via sysfs
Input: ili210x - add ili251x firmware update support
Input: ili210x - special case ili251x sample read out
Input: ili210x - improve polled sample spacing
Input: ili210x - reduce sample period to 15ms
Mark Brown (1):
Input: ariel-pwrbutton - add SPI device ID table
Phoenix Huang (1):
Input: elantench - fix misreporting trackpoint coordinates
Randy Dunlap (1):
Input: max8925_onkey - don't mark comment as kernel-doc
Shawn Guo (2):
reboot: export symbol 'reboot_mode'
Input: pm8941-pwrkey - respect reboot_mode for warm reset
Stephan Gerhold (2):
Input: tm2-touchkey - report scan codes
Input: tm2-touchkey - allow changing keycodes from userspace
Takashi Iwai (1):
Input: i8042 - Add quirk for Fujitsu Lifebook T725
Tang Bin (1):
Input: cpcap-pwrbutton - handle errors from platform_get_irq()
Uwe Kleine-König (2):
Input: adxl34x - make adxl34x_remove() return void
Input: tsc200x - make tsc200x_remove() return void
Yassine Oudjana (2):
Input: cypress-sf - add Cypress StreetFighter touchkey driver
dt-bindings: input: Add binding for cypress-sf
simba.hsu (1):
Input: raydium_i2c_ts - read device version in bootloader mode
Diffstat:
--------
.../devicetree/bindings/input/cypress-sf.yaml | 61 +++
.../bindings/input/microchip,cap11xx.yaml | 1 +
MAINTAINERS | 12 +-
drivers/input/joystick/analog.c | 18 +-
drivers/input/joystick/iforce/iforce-usb.c | 2 +-
drivers/input/joystick/tmdc.c | 2 +-
drivers/input/keyboard/Kconfig | 10 +
drivers/input/keyboard/Makefile | 1 +
drivers/input/keyboard/cap11xx.c | 43 +-
drivers/input/keyboard/cypress-sf.c | 224 +++++++++
drivers/input/keyboard/ep93xx_keypad.c | 172 +++----
drivers/input/keyboard/mpr121_touchkey.c | 4 +-
drivers/input/keyboard/omap-keypad.c | 3 +-
drivers/input/keyboard/tm2-touchkey.c | 7 +
drivers/input/misc/adxl34x-i2c.c | 4 +-
drivers/input/misc/adxl34x-spi.c | 4 +-
drivers/input/misc/adxl34x.c | 6 +-
drivers/input/misc/adxl34x.h | 2 +-
drivers/input/misc/ariel-pwrbutton.c | 7 +
drivers/input/misc/cpcap-pwrbutton.c | 7 +-
drivers/input/misc/max77693-haptic.c | 1 -
drivers/input/misc/max8925_onkey.c | 2 +-
drivers/input/misc/palmas-pwrbutton.c | 5 +
drivers/input/misc/pm8941-pwrkey.c | 6 +-
drivers/input/mouse/elantech.c | 13 +
drivers/input/rmi4/rmi_bus.c | 1 +
drivers/input/serio/i8042-x86ia64io.h | 14 +
drivers/input/touchscreen/Kconfig | 1 +
drivers/input/touchscreen/Makefile | 3 +-
drivers/input/touchscreen/ads7846.c | 200 +++-----
drivers/input/touchscreen/elants_i2c.c | 4 +-
drivers/input/touchscreen/goodix.c | 231 ++++-----
drivers/input/touchscreen/goodix.h | 117 +++++
drivers/input/touchscreen/goodix_fwupload.c | 427 ++++++++++++++++
drivers/input/touchscreen/ili210x.c | 559 ++++++++++++++++++++-
drivers/input/touchscreen/raydium_i2c_ts.c | 54 +-
drivers/input/touchscreen/st1232.c | 3 +-
drivers/input/touchscreen/tsc2004.c | 4 +-
drivers/input/touchscreen/tsc2005.c | 4 +-
drivers/input/touchscreen/tsc200x-core.c | 4 +-
drivers/input/touchscreen/tsc200x-core.h | 2 +-
drivers/input/touchscreen/wacom_i2c.c | 22 +-
include/linux/input/cy8ctmg110_pdata.h | 10 -
include/linux/spi/ads7846.h | 15 -
kernel/reboot.c | 1 +
45 files changed, 1833 insertions(+), 460 deletions(-)
create mode 100644 Documentation/devicetree/bindings/input/cypress-sf.yaml
create mode 100644 drivers/input/keyboard/cypress-sf.c
create mode 100644 drivers/input/touchscreen/goodix.h
create mode 100644 drivers/input/touchscreen/goodix_fwupload.c
delete mode 100644 include/linux/input/cy8ctmg110_pdata.h
Thanks.
--
Dmitry
