arm64: zynqmp: Move PM version related macros to .h

This patch moves the PM version related macros to .h file so that
they can be reused in other files.

Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/cpu/armv8/zynqmp/cpu.c b/arch/arm/cpu/armv8/zynqmp/cpu.c
index 47b7f3c0ae079efd6a2f3b4fbc00a90a1d674ad4..067aa0acd63bc96114ce5ddfa7ebf8374cb6fd05 100644 (file)
--- a/arch/arm/cpu/armv8/zynqmp/cpu.c
+++ b/arch/arm/cpu/armv8/zynqmp/cpu.c
@@ -176,17 +176,6 @@ int __maybe_unused invoke_smc(u32 pm_api_id, u32 arg0, u32 arg1, u32 arg2,
        return regs.regs[0];
 }
 
-#define ZYNQMP_SIP_SVC_GET_API_VERSION         0xC2000001
-
-#define ZYNQMP_PM_VERSION_MAJOR                1
-#define ZYNQMP_PM_VERSION_MINOR                0
-#define ZYNQMP_PM_VERSION_MAJOR_SHIFT  16
-#define ZYNQMP_PM_VERSION_MINOR_MASK   0xFFFF
-
-#define ZYNQMP_PM_VERSION      \
-       ((ZYNQMP_PM_VERSION_MAJOR << ZYNQMP_PM_VERSION_MAJOR_SHIFT) | \
-                                ZYNQMP_PM_VERSION_MINOR)
-
 #if defined(CONFIG_CLK_ZYNQMP)
 void zynqmp_pmufw_version(void)
 {

diff --git a/arch/arm/include/asm/arch-zynqmp/sys_proto.h b/arch/arm/include/asm/arch-zynqmp/sys_proto.h
index 6afdf2a14202d2fc60c4e709f74a5f31bde5c4fa..67d389675a8297edb813791033c4ebcfb7f0a3b5 100644 (file)
--- a/arch/arm/include/asm/arch-zynqmp/sys_proto.h
+++ b/arch/arm/include/asm/arch-zynqmp/sys_proto.h
@@ -22,6 +22,17 @@
 
 #define ZYNQMP_FPGA_AUTH_DDR   1
 
+#define ZYNQMP_SIP_SVC_GET_API_VERSION         0xC2000001
+
+#define ZYNQMP_PM_VERSION_MAJOR                1
+#define ZYNQMP_PM_VERSION_MINOR                0
+#define ZYNQMP_PM_VERSION_MAJOR_SHIFT  16
+#define ZYNQMP_PM_VERSION_MINOR_MASK   0xFFFF
+
+#define ZYNQMP_PM_VERSION      \
+       ((ZYNQMP_PM_VERSION_MAJOR << ZYNQMP_PM_VERSION_MAJOR_SHIFT) | \
+                                ZYNQMP_PM_VERSION_MINOR)
+
 enum {
        IDCODE,
        VERSION,