From: Arnd Bergmann Date: Wed, 10 Oct 2018 11:35:29 +0000 (+0200) Subject: Merge tag 'imx-drivers-4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawn... X-Git-Tag: v4.20-rc1~64^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0a2cea5eb637d540ba86fd31dfd750f26ee0161;p=thirdparty%2Flinux.git Merge tag 'imx-drivers-4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/drivers 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 --- b0a2cea5eb637d540ba86fd31dfd750f26ee0161 diff --cc drivers/firmware/Kconfig index 36344cba764e3,bd9e4e2c41dbd..7670e8dda8295 --- a/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 99583d3df52f9,e1281d6a03d4c..13660a9514379 --- a/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/