Merge tag 'zynqmp-soc-for-v5.7' of https://github.com/Xilinx/linux-xlnx into arm/soc (880e1929) · Commits · 戴 / test

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:

arch/arm64/Kconfig.platforms

+0 −1

Original line number	Diff line number	Diff line
		@@ -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

+2 −0

Original line number	Diff line number	Diff line
		@@ -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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)