From: Michal Simek Date: Thu, 20 Dec 2018 08:41:12 +0000 (+0100) Subject: arm64: zynqmp: Do not protect zynqmp_pmufw_version() X-Git-Tag: v2019.04-rc1~28^2~32 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f11d4ab0b37ede1eed45540ac4e2384b3d19ce98;p=oweals%2Fu-boot.git arm64: zynqmp: Do not protect zynqmp_pmufw_version() There is hard dependency for CLK_ZYNQMP to have zynqmp_pmufw_version() but also FPGA code is calling this function which is possible to use without actual CLK_ZYNQMP firmware driver to be enabled. This patch enables the case where only fixed-clock CLK setup is used. Signed-off-by: Michal Simek --- diff --git a/arch/arm/cpu/armv8/zynqmp/cpu.c b/arch/arm/cpu/armv8/zynqmp/cpu.c index 4ee8e3f627..5ef1a52862 100644 --- a/arch/arm/cpu/armv8/zynqmp/cpu.c +++ b/arch/arm/cpu/armv8/zynqmp/cpu.c @@ -179,8 +179,7 @@ int __maybe_unused invoke_smc(u32 pm_api_id, u32 arg0, u32 arg1, u32 arg2, return regs.regs[0]; } -#if defined(CONFIG_CLK_ZYNQMP) -unsigned int zynqmp_pmufw_version(void) +unsigned int __maybe_unused zynqmp_pmufw_version(void) { int ret; u32 ret_payload[PAYLOAD_ARG_CNT]; @@ -202,7 +201,6 @@ unsigned int zynqmp_pmufw_version(void) return pm_api_version; } -#endif static int zynqmp_mmio_rawwrite(const u32 address, const u32 mask,