Merge tag 'v6.5' into next

Sync up with mainline to bring in updates to the shared infrastructure.

diff --combined drivers/input/misc/Kconfig
index c47eecc,8a320e6..6ba984d
--- 1/drivers/input/misc/Kconfig
--- 2/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@@ -609,7 -609,7 +609,7 @@@ config INPUT_PWM_VIBR
  
  config INPUT_RK805_PWRKEY
        tristate "Rockchip RK805 PMIC power key support"
-       depends on MFD_RK808
+       depends on MFD_RK8XX
        help
          Select this option to enable power key driver for RK805.
  
@@@ -791,10 -791,10 +791,10 @@@ config INPUT_IQS626
          module will be called iqs626a.
  
  config INPUT_IQS7222
 -      tristate "Azoteq IQS7222A/B/C capacitive touch controller"
 +      tristate "Azoteq IQS7222A/B/C/D capacitive touch controller"
        depends on I2C
        help
 -        Say Y to enable support for the Azoteq IQS7222A/B/C family
 +        Say Y to enable support for the Azoteq IQS7222A/B/C/D family
          of capacitive touch controllers.
  
          To compile this driver as a module, choose M here: the