arm64: versal: Clean pm_api_id usage

Copy enum values from platform code to firmware code. IDs are shared
between ZynqMP and Versal.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/mach-versal/cpu.c b/arch/arm/mach-versal/cpu.c
index 49f1e51..60394e7 100644 (file)
--- a/arch/arm/mach-versal/cpu.c
+++ b/arch/arm/mach-versal/cpu.c
@@ -9,6 +9,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
+#include <zynqmp_firmware.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

diff --git a/arch/arm/mach-versal/include/mach/sys_proto.h b/arch/arm/mach-versal/include/mach/sys_proto.h
index 2f5ad02..c282078 100644 (file)
--- a/arch/arm/mach-versal/include/mach/sys_proto.h
+++ b/arch/arm/mach-versal/include/mach/sys_proto.h
@@ -8,61 +8,6 @@ enum {
        TCM_SPLIT,
 };
 
-enum pm_api_id {
-       PM_GET_API_VERSION = 1,
-       PM_SET_CONFIGURATION,
-       PM_GET_NODE_STATUS,
-       PM_GET_OPERATING_CHARACTERISTIC,
-       PM_REGISTER_NOTIFIER,
-       PM_REQUEST_SUSPEND,
-       PM_SELF_SUSPEND,
-       PM_FORCE_POWERDOWN,
-       PM_ABORT_SUSPEND,
-       PM_REQUEST_WAKEUP,
-       PM_SET_WAKEUP_SOURCE,
-       PM_SYSTEM_SHUTDOWN,
-       PM_REQUEST_NODE,
-       PM_RELEASE_NODE,
-       PM_SET_REQUIREMENT,
-       PM_SET_MAX_LATENCY,
-       PM_RESET_ASSERT,
-       PM_RESET_GET_STATUS,
-       PM_MMIO_WRITE,
-       PM_MMIO_READ,
-       PM_PM_INIT_FINALIZE,
-       PM_FPGA_LOAD,
-       PM_FPGA_GET_STATUS,
-       PM_GET_CHIPID,
-       PM_SECURE_SHA = 26,
-       PM_SECURE_RSA,
-       PM_PINCTRL_REQUEST,
-       PM_PINCTRL_RELEASE,
-       PM_PINCTRL_GET_FUNCTION,
-       PM_PINCTRL_SET_FUNCTION,
-       PM_PINCTRL_CONFIG_PARAM_GET,
-       PM_PINCTRL_CONFIG_PARAM_SET,
-       PM_IOCTL,
-       PM_QUERY_DATA,
-       PM_CLOCK_ENABLE,
-       PM_CLOCK_DISABLE,
-       PM_CLOCK_GETSTATE,
-       PM_CLOCK_SETDIVIDER,
-       PM_CLOCK_GETDIVIDER,
-       PM_CLOCK_SETRATE,
-       PM_CLOCK_GETRATE,
-       PM_CLOCK_SETPARENT,
-       PM_CLOCK_GETPARENT,
-       PM_SECURE_IMAGE,
-       PM_FPGA_READ = 46,
-       PM_SECURE_AES,
-       PM_CLOCK_PLL_GETPARAM = 49,
-       PM_REGISTER_ACCESS = 52,
-       PM_EFUSE_ACCESS,
-       PM_FEATURE_CHECK = 63,
-       PM_API_MAX,
-};
-
-#define PM_SIP_SVC     0xC2000000
 #define PAYLOAD_ARG_CNT        4U
 
 void tcm_init(u8 mode);

diff --git a/drivers/clk/clk_versal.c b/drivers/clk/clk_versal.c
index df87645..e0fa661 100644 (file)
--- a/drivers/clk/clk_versal.c
+++ b/drivers/clk/clk_versal.c
@@ -12,6 +12,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <asm/arch/sys_proto.h>
+#include <zynqmp_firmware.h>
 
 #define MAX_PARENT                     100
 #define MAX_NODES                      6

diff --git a/include/zynqmp_firmware.h b/include/zynqmp_firmware.h
index a20cbcd..7429348 100644 (file)
--- a/include/zynqmp_firmware.h
+++ b/include/zynqmp_firmware.h
@@ -11,7 +11,55 @@
 enum pm_api_id {
        PM_GET_API_VERSION = 1,
        PM_SET_CONFIGURATION,
-       PM_SECURE_IMAGE = 45,
+       PM_GET_NODE_STATUS,
+       PM_GET_OPERATING_CHARACTERISTIC,
+       PM_REGISTER_NOTIFIER,
+       PM_REQUEST_SUSPEND,
+       PM_SELF_SUSPEND,
+       PM_FORCE_POWERDOWN,
+       PM_ABORT_SUSPEND,
+       PM_REQUEST_WAKEUP,
+       PM_SET_WAKEUP_SOURCE,
+       PM_SYSTEM_SHUTDOWN,
+       PM_REQUEST_NODE,
+       PM_RELEASE_NODE,
+       PM_SET_REQUIREMENT,
+       PM_SET_MAX_LATENCY,
+       PM_RESET_ASSERT,
+       PM_RESET_GET_STATUS,
+       PM_MMIO_WRITE,
+       PM_MMIO_READ,
+       PM_PM_INIT_FINALIZE,
+       PM_FPGA_LOAD,
+       PM_FPGA_GET_STATUS,
+       PM_GET_CHIPID,
+       PM_SECURE_SHA = 26,
+       PM_SECURE_RSA,
+       PM_PINCTRL_REQUEST,
+       PM_PINCTRL_RELEASE,
+       PM_PINCTRL_GET_FUNCTION,
+       PM_PINCTRL_SET_FUNCTION,
+       PM_PINCTRL_CONFIG_PARAM_GET,
+       PM_PINCTRL_CONFIG_PARAM_SET,
+       PM_IOCTL,
+       PM_QUERY_DATA,
+       PM_CLOCK_ENABLE,
+       PM_CLOCK_DISABLE,
+       PM_CLOCK_GETSTATE,
+       PM_CLOCK_SETDIVIDER,
+       PM_CLOCK_GETDIVIDER,
+       PM_CLOCK_SETRATE,
+       PM_CLOCK_GETRATE,
+       PM_CLOCK_SETPARENT,
+       PM_CLOCK_GETPARENT,
+       PM_SECURE_IMAGE,
+       PM_FPGA_READ = 46,
+       PM_SECURE_AES,
+       PM_CLOCK_PLL_GETPARAM = 49,
+       PM_REGISTER_ACCESS = 52,
+       PM_EFUSE_ACCESS,
+       PM_FEATURE_CHECK = 63,
+       PM_API_MAX,
 };
 
 #define PM_SIP_SVC      0xc2000000