Merge tag 'imx-drivers-4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawn...

i.MX drivers change for 4.20, round 2:
 - A series from Aisheng Dong to add SCU firmware driver for i.MX8
   SoCs.  It implements IPC mechanism based on mailbox for message
   exchange between AP and SCU firmware, and a set of SCU IPC
   service APIs used by clients like i.MX8 power domain and clock
   drivers.

* tag 'imx-drivers-4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  MAINTAINERS: imx: include drivers/firmware/imx path
  firmware: imx: add misc svc support
  firmware: imx: add SCU firmware driver support
  dt-bindings: arm: fsl: add scu binding doc

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/firmware/Kconfig
index 36344cba764e377daf97494d8ead9c86b97ea5c3,bd9e4e2c41dbd2e6c42c56195239f9b5bbc1e986..7670e8dda82951312feee7eca53f7499129c911a
--- 1/drivers/firmware/Kconfig
--- 2/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@@ -289,8 -289,8 +289,9 @@@ config HAVE_ARM_SMCC
  source "drivers/firmware/broadcom/Kconfig"
  source "drivers/firmware/google/Kconfig"
  source "drivers/firmware/efi/Kconfig"
+ source "drivers/firmware/imx/Kconfig"
  source "drivers/firmware/meson/Kconfig"
  source "drivers/firmware/tegra/Kconfig"
 +source "drivers/firmware/xilinx/Kconfig"
  
  endmenu

diff --cc drivers/firmware/Makefile
index 99583d3df52f9dadb870442e56394241f334c9e9,e1281d6a03d4c73f63e78f059ae3f24e7a993d3a..13660a9514379e7534af0f56c6e084f68b2ef02c
--- 1/drivers/firmware/Makefile
--- 2/drivers/firmware/Makefile
+++ b/drivers/firmware/Makefile
@@@ -31,5 -31,5 +31,6 @@@ obj-y                         += meson
  obj-$(CONFIG_GOOGLE_FIRMWARE) += google/
  obj-$(CONFIG_EFI)             += efi/
  obj-$(CONFIG_UEFI_CPER)               += efi/
+ obj-y                         += imx/
  obj-y                         += tegra/
 +obj-y                         += xilinx/