From 92c30ac35b298bb4049778ed1c0b95713e44e44c Mon Sep 17 00:00:00 2001
From: Tejas Patel <tejas.patel@xilinx.com>
Date: Fri, 10 Jan 2020 03:08:40 -0800
Subject: [PATCH] plat: xilinx: Move pm_client.h to common directory
Move pm_client.h to common directory to avoid duplication
of function declaration.
Signed-off-by: Tejas Patel <tejas.patel@xilinx.com>
Signed-off-by: Jolly Shah <jolly.shah@xilinx.com>
Change-Id: Iea542e681f42db089cccd9b24d286ac8f0a2ce35
---
.../pm_service => common/include}/pm_client.h | 11 +++++---
plat/xilinx/versal/pm_service/pm_client.h | 26 -------------------
2 files changed, 7 insertions(+), 30 deletions(-)
rename plat/xilinx/{zynqmp/pm_service => common/include}/pm_client.h (88%)
delete mode 100644 plat/xilinx/versal/pm_service/pm_client.h
diff --git a/plat/xilinx/zynqmp/pm_service/pm_client.h b/plat/xilinx/common/include/pm_client.h
similarity index 88%
rename from plat/xilinx/zynqmp/pm_service/pm_client.h
rename to plat/xilinx/common/include/pm_client.h
index adbb76f9b..e91bb8f6c 100644
--- a/plat/xilinx/zynqmp/pm_service/pm_client.h
+++ b/plat/xilinx/common/include/pm_client.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2015, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -19,11 +19,14 @@
void pm_client_suspend(const struct pm_proc *proc, unsigned int state);
void pm_client_abort_suspend(void);
void pm_client_wakeup(const struct pm_proc *proc);
-enum pm_ret_status set_ocm_retention(void);
-enum pm_ret_status pm_set_suspend_mode(uint32_t mode);
-const struct pm_proc *pm_get_proc_by_node(enum pm_node_id nid);
/* Global variables to be set in pm_client.c */
extern const struct pm_proc *primary_proc;
+#ifndef VERSAL_PLATFORM
+enum pm_ret_status set_ocm_retention(void);
+enum pm_ret_status pm_set_suspend_mode(uint32_t mode);
+const struct pm_proc *pm_get_proc_by_node(enum pm_node_id nid);
+#endif
+
#endif /* PM_CLIENT_H */
diff --git a/plat/xilinx/versal/pm_service/pm_client.h b/plat/xilinx/versal/pm_service/pm_client.h
deleted file mode 100644
index 91f135c06..000000000
--- a/plat/xilinx/versal/pm_service/pm_client.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2019, Xilinx, Inc. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-/*
- * Contains APU specific macros and macros to be defined depending on
- * the execution environment.
- */
-
-#ifndef PM_CLIENT_H
-#define PM_CLIENT_H
-
-#include "pm_common.h"
-#include "pm_defs.h"
-
-/* Functions to be implemented by each PU */
-void pm_client_suspend(const struct pm_proc *proc, unsigned int state);
-void pm_client_wakeup(const struct pm_proc *proc);
-void pm_client_abort_suspend(void);
-
-/* Global variables to be set in pm_client.c */
-extern const struct pm_proc *primary_proc;
-
-#endif /* PM_CLIENT_H */
--
GitLab