Merge tag 'zynqmp-soc-for-v5.7' of https://github.com/Xilinx/linux-xlnx into arm/soc

arm64: soc: ZynqMP SoC changes for v5.7

- Change firmware dependency to be able to disable it

* tag 'zynqmp-soc-for-v5.7' of https://github.com/Xilinx/linux-xlnx:
  arm64: zynqmp: Make zynqmp_firmware driver optional
  include: linux: firmware: Correct config dependency of zynqmp_eemi_ops

Link: https://lore.kernel.org/r/ecef6de5-8318-9f88-db8c-7c33fe44901f@monstr.eu
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index ad4335122e70a3b7f74547de2355b5099ac1c223..3c7e310fd8bfab05a6888f44ac8b65ebfcd83a05 100644 (file)
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -300,7 +300,6 @@ config ARCH_ZX
 
 config ARCH_ZYNQMP
        bool "Xilinx ZynqMP Family"
-       select ZYNQMP_FIRMWARE
        help
          This enables support for Xilinx ZynqMP Family
 

diff --git a/drivers/firmware/xilinx/Kconfig b/drivers/firmware/xilinx/Kconfig
index bd33bbf70daf061d6609c111c4aafa829b2880c6..9a9bd190888ebd3f8467dd9be8129b3ffde67317 100644 (file)
--- a/drivers/firmware/xilinx/Kconfig
+++ b/drivers/firmware/xilinx/Kconfig
@@ -6,6 +6,8 @@ menu "Zynq MPSoC Firmware Drivers"
 
 config ZYNQMP_FIRMWARE
        bool "Enable Xilinx Zynq MPSoC firmware interface"
+       depends on ARCH_ZYNQMP
+       default y if ARCH_ZYNQMP
        select MFD_CORE
        help
          Firmware interface driver is used by different

diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/xlnx-zynqmp.h
index 2cd12ebd6826bb149d5ee9cc6b62c857843a59c5..ed1aace0cbbce4039060716b2689bdfbe1cb3774 100644 (file)
--- a/include/linux/firmware/xlnx-zynqmp.h
+++ b/include/linux/firmware/xlnx-zynqmp.h
@@ -320,7 +320,7 @@ struct zynqmp_eemi_ops {
 int zynqmp_pm_invoke_fn(u32 pm_api_id, u32 arg0, u32 arg1,
                        u32 arg2, u32 arg3, u32 *ret_payload);
 
-#if IS_REACHABLE(CONFIG_ARCH_ZYNQMP)
+#if IS_REACHABLE(CONFIG_ZYNQMP_FIRMWARE)
 const struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void);
 #else
 static inline struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void)