From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 11 Sep 2021 16:08:28 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: microblaze-v5.16~26
X-Git-Url: http://git.monstr.eu/?p=linux-2.6-microblaze.git;a=commitdiff_plain;h=765092e4cdaa8439b969952ec4e6de3b84241f90;hp=-c

Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

Pull input updates from Dmitry Torokhov:

 - several device tree bindings for input devices have been converted to
   yaml

 - dropped no longer used ixp4xx-beeper and CSR Prima2 PWRC drivers

 - analog joystick has been converted to use ktime API and no longer
   warn about low resolution timers

 - a few driver fixes

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (24 commits)
  Input: analog - always use ktime functions
  Input: mms114 - support MMS134S
  Input: elan_i2c - reduce the resume time for controller in Whitebox
  Input: edt-ft5x06 - added case for EDT EP0110M09
  Input: adc-keys - drop bogus __refdata annotation
  Input: Fix spelling mistake in Kconfig "useable" -> "usable"
  Input: Fix spelling mistake in Kconfig "Modul" -> "Module"
  Input: remove dead CSR Prima2 PWRC driver
  Input: adp5589-keys - use the right header
  Input: adp5588-keys - use the right header
  dt-bindings: input: tsc2005: Convert to YAML schema
  Input: ep93xx_keypad - prepare clock before using it
  dt-bindings: input: sun4i-lradc: Add wakeup-source
  dt-bindings: input: Convert Regulator Haptic binding to a schema
  dt-bindings: input: Convert Pixcir Touchscreen binding to a schema
  dt-bindings: input: Convert ChipOne ICN8318 binding to a schema
  Input: pm8941-pwrkey - fix comma vs semicolon issue
  dt-bindings: power: reset: qcom-pon: Convert qcom PON binding to yaml
  dt-bindings: input: pm8941-pwrkey: Convert pm8941 power key binding to yaml
  dt-bindings: power: reset: Change 'additionalProperties' to true
  ...
---

765092e4cdaa8439b969952ec4e6de3b84241f90
diff --combined drivers/input/keyboard/Kconfig
index 40a070a2e7f5,1b0afc8bf841..e75650e98c9e
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@@ -67,6 -67,9 +67,6 @@@ config KEYBOARD_AMIG
  	  To compile this driver as a module, choose M here: the
  	  module will be called amikbd.
  
 -config ATARI_KBD_CORE
 -	bool
 -
  config KEYBOARD_APPLESPI
  	tristate "Apple SPI keyboard and trackpad"
  	depends on ACPI && EFI
@@@ -210,7 -213,7 +210,7 @@@ config KEYBOARD_LKKB
  	select SERIO
  	help
  	  Say Y here if you want to use a LK201 or LK401 style serial
- 	  keyboard. This keyboard is also useable on PCs if you attach
+ 	  keyboard. This keyboard is also usable on PCs if you attach
  	  it with the inputattach program. The connector pinout is
  	  described within lkkbd.c.