Merge tag 'input-for-v7.1-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor...

Pull input updates from Dmitry Torokhov:

 - a new charlieplex GPIO keypad driver

 - an update to aw86927 driver to support 86938 chip

 - an update for Chrome OS EC keyboard driver to support Fn-<key> keymap
   extension

 - an UAF fix in debugfs teardown in EDT touchscreen driver

 - a number of conversions for input drivers to use guard() and __free()
   cleanup primitives

 - several drivers for bus mice (inport, logibm) and other very old
   devices have been removed

 - OLPC HGPK PS/2 protocol has been removed as it's been broken and
   inactive for 10 something years

 - dedicated kpsmoused has been removed from psmouse driver

 - other assorted cleanups and fixups

* tag 'input-for-v7.1-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (101 commits)
  Input: charlieplex_keypad - add GPIO charlieplex keypad
  dt-bindings: input: add GPIO charlieplex keypad
  dt-bindings: input: add settling-time-us common property
  dt-bindings: input: add debounce-delay-ms common property
  Input: imx_keypad - fix spelling mistake "Colums" -> "Columns"
  Input: edt-ft5x06 - fix use-after-free in debugfs teardown
  Input: ims-pcu - fix heap-buffer-overflow in ims_pcu_process_data()
  Input: ct82c710 - remove driver
  Input: mk712 - remove driver
  Input: logibm - remove driver
  Input: inport - remove driver
  Input: qt1070 - inline i2c_check_functionality check
  Input: qt1050 - inline i2c_check_functionality check
  Input: aiptek - validate raw macro indices before updating state
  Input: gf2k - skip invalid hat lookup values
  Input: xpad - add RedOctane Games vendor id
  Input: xpad - remove stale TODO and changelog header
  Input: usbtouchscreen - refactor endpoint lookup
  Input: aw86927 - add support for Awinic AW86938
  dt-bindings: input: awinic,aw86927: Add Awinic AW86938
  ...

diff --cc Documentation/devicetree/bindings/auxdisplay/holtek,ht16k33.yaml
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/input/mouse/Kconfig
index c8b87a87744c28674f450a08fed743b8a6d134c2,04d56f40ecb631dee369aadffe55c3dc7be069c6..074130d8895381c555880423764402f2ff1f4415
--- 1/drivers/input/mouse/Kconfig
--- 2/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@@ -300,32 -290,16 +290,6 @@@ config MOUSE_ELAN_I2C_SMBU
  
           If unsure, say Y.
  
- config MOUSE_INPORT
-       tristate "InPort/MS/ATIXL busmouse"
-       depends on ISA
-       help
-         Say Y here if you have an InPort, Microsoft or ATI XL busmouse.
-         They are rather rare these days.
- 
-         To compile this driver as a module, choose M here: the
-         module will be called inport.
- 
- config MOUSE_ATIXL
-       bool "ATI XL variant"
-       depends on MOUSE_INPORT
-       help
-         Say Y here if your mouse is of the ATI XL variety.
- 
- config MOUSE_LOGIBM
-       tristate "Logitech busmouse"
 -config MOUSE_PC110PAD
 -      tristate "IBM PC110 touchpad"
--      depends on ISA
--      help
-         Say Y here if you have a Logitech busmouse.
-         They are rather rare these days.
 -        Say Y if you have the IBM PC-110 micro-notebook and want its
 -        touchpad supported.
--
--        To compile this driver as a module, choose M here: the
-         module will be called logibm.
 -        module will be called pc110pad.
--
  config MOUSE_AMIGA
        tristate "Amiga mouse"
        depends on AMIGA

diff --cc drivers/input/mouse/Makefile
index 78ab5db28d7c09890cb341bd67d7bdf31fa09e90,16d1cdf3182fef121224564cc3ed4156de839e44..ed40f141691e2f0a3c55701b22b8bceab990d101
--- 1/drivers/input/mouse/Makefile
--- 2/drivers/input/mouse/Makefile
+++ b/drivers/input/mouse/Makefile
@@@ -12,9 -12,8 +12,7 @@@ obj-$(CONFIG_MOUSE_BCM5974)           += bcm5974
  obj-$(CONFIG_MOUSE_CYAPA)             += cyapatp.o
  obj-$(CONFIG_MOUSE_ELAN_I2C)          += elan_i2c.o
  obj-$(CONFIG_MOUSE_GPIO)              += gpio_mouse.o
- obj-$(CONFIG_MOUSE_INPORT)            += inport.o
- obj-$(CONFIG_MOUSE_LOGIBM)            += logibm.o
  obj-$(CONFIG_MOUSE_MAPLE)             += maplemouse.o
 -obj-$(CONFIG_MOUSE_PC110PAD)          += pc110pad.o
  obj-$(CONFIG_MOUSE_PS2)                       += psmouse.o
  obj-$(CONFIG_MOUSE_RISCPC)            += rpcmouse.o
  obj-$(CONFIG_MOUSE_SERIAL)            += sermouse.o