Merge tag 'v5.4-rc5' into next

Sync up with mainline.

diff --combined Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
index e57eaff,c149fad..70c1a62
--- 1/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
--- 2/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
+++ b/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
@@@ -136,7 -136,9 +136,9 @@@ Required properties
  OCOTP bindings based on SCU Message Protocol
  ------------------------------------------------------------
  Required properties:
- - compatible:         Should be "fsl,imx8qxp-scu-ocotp"
+ - compatible:         Should be one of:
+                       "fsl,imx8qm-scu-ocotp",
+                       "fsl,imx8qxp-scu-ocotp".
  - #address-cells:     Must be 1. Contains byte index
  - #size-cells:                Must be 1. Contains byte length
  
@@@ -155,15 -157,6 +157,15 @@@ Required properties
  Optional properties:
  - timeout-sec: contains the watchdog timeout in seconds.
  
 +SCU key bindings based on SCU Message Protocol
 +------------------------------------------------------------
 +
 +Required properties:
 +- compatible: should be:
 +              "fsl,imx8qxp-sc-key"
 +              followed by "fsl,imx-sc-key";
 +- linux,keycodes: See Documentation/devicetree/bindings/input/keys.txt
 +
  Example (imx8qxp):
  -------------
  aliases {
@@@ -227,11 -220,6 +229,11 @@@ firmware 
                        compatible = "fsl,imx8qxp-sc-rtc";
                };
  
 +              scu_key: scu-key {
 +                      compatible = "fsl,imx8qxp-sc-key", "fsl,imx-sc-key";
 +                      linux,keycodes = <KEY_POWER>;
 +              };
 +
                watchdog {
                        compatible = "fsl,imx8qxp-sc-wdt", "fsl,imx-sc-wdt";
                        timeout-sec = <60>;

diff --combined drivers/input/keyboard/Kconfig
index a716a90,8911bc2..04ad371
--- 1/drivers/input/keyboard/Kconfig
--- 2/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@@ -469,16 -469,6 +469,16 @@@ config KEYBOARD_IM
          To compile this driver as a module, choose M here: the
          module will be called imx_keypad.
  
 +config KEYBOARD_IMX_SC_KEY
 +      tristate "IMX SCU Key Driver"
 +      depends on IMX_SCU
 +      help
 +        This is the system controller key driver for NXP i.MX SoCs with
 +        system controller inside.
 +
 +        To compile this driver as a module, choose M here: the
 +        module will be called imx_sc_key.
 +
  config KEYBOARD_NEWTON
        tristate "Newton keyboard"
        select SERIO
@@@ -746,7 -736,7 +746,7 @@@ config KEYBOARD_XTKB
  config KEYBOARD_CROS_EC
        tristate "ChromeOS EC keyboard"
        select INPUT_MATRIXKMAP
-       depends on MFD_CROS_EC
+       depends on CROS_EC
        help
          Say Y here to enable the matrix keyboard used by ChromeOS devices
          and implemented on the ChromeOS EC. You must enable one bus option