From a8b9765edcea35d052f57dff26d760ff51d25b92 Mon Sep 17 00:00:00 2001
From: Soren Brinkmann <soren.brinkmann@xilinx.com>
Date: Sun, 12 Apr 2015 20:24:26 -0700
Subject: [PATCH] xilpm: Move common parts to common header

The pm_client.h headers hold processor specific information. Move common
information to the common header.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
---
 lib/sw_services/xilpm/src/apu/pm_client.h    | 35 ------------------
 lib/sw_services/xilpm/src/common/pm_common.h | 37 ++++++++++++++++++++
 lib/sw_services/xilpm/src/rpu/pm_client.h    | 32 -----------------
 3 files changed, 37 insertions(+), 67 deletions(-)

diff --git a/lib/sw_services/xilpm/src/apu/pm_client.h b/lib/sw_services/xilpm/src/apu/pm_client.h
index a59f6ef1..20ca8e0e 100644
--- a/lib/sw_services/xilpm/src/apu/pm_client.h
+++ b/lib/sw_services/xilpm/src/apu/pm_client.h
@@ -49,47 +49,12 @@
 
 #define MASTER_PWRCTL		APU_PWRCTL
 
-#define APU_0_PWRCTL_CPUPWRDWNREQ_MASK	0x00000001U
-#define APU_1_PWRCTL_CPUPWRDWNREQ_MASK	0x00000002U
-#define APU_2_PWRCTL_CPUPWRDWNREQ_MASK	0x00000004U
-#define APU_3_PWRCTL_CPUPWRDWNREQ_MASK	0x00000008U
-
 #define IPI_APU_MASK		0x00000001U
 
 #define IPI_TRIG_OFFSET		0x00000000
 #define IPI_OBS_OFFSET		0x00000004
 
-#define UNDEFINED_CPUID		(~0)
-
-#define pm_read(addr)		Xil_In32(addr)
-#define pm_write(addr, value)	Xil_Out32(addr, value)
-#define pm_enable_int()		Xil_ExceptionEnable()
-#define pm_disable_int()	Xil_ExceptionDisable()
 #define pm_print(MSG, ...)	xil_printf("APU: "MSG,##__VA_ARGS__)
 #define pm_this_cpuid()		0U
 
-/* Conditional debugging prints */
-#ifdef DEBUG_MODE
-	#define pm_dbg(MSG, ...) \
-		do { \
-			pm_print(MSG,##__VA_ARGS__); \
-		} while (0)
-#else
-	#define pm_dbg(MSG, ...)	{}
-#endif
-
-#ifndef bool
-	#define bool	uint8_t
-	#define true	1U
-	#define false	0U
-#endif
-
-void XPm_ClientSuspend(const struct XPm_Master *const master);
-void XPm_ClientAbortSuspend(void);
-void XPm_ClientWakeup(const struct XPm_Master *const master);
-
-/* Do not modify below this line */
-extern const enum XPmNodeId subsystem_node;
-extern const struct XPm_Master *primary_master;
-
 #endif /* _PM_CLIENT_H_ */
diff --git a/lib/sw_services/xilpm/src/common/pm_common.h b/lib/sw_services/xilpm/src/common/pm_common.h
index fe357500..a0ac6c57 100644
--- a/lib/sw_services/xilpm/src/common/pm_common.h
+++ b/lib/sw_services/xilpm/src/common/pm_common.h
@@ -74,4 +74,41 @@ const enum XPmNodeId pm_get_subsystem_node(void);
 const struct XPm_Master *pm_get_master(const uint32_t cpuid);
 const struct XPm_Master *pm_get_master_by_node(const enum XPmNodeId nid);
 
+#define APU_0_PWRCTL_CPUPWRDWNREQ_MASK	0x00000001U
+#define APU_1_PWRCTL_CPUPWRDWNREQ_MASK	0x00000002U
+#define APU_2_PWRCTL_CPUPWRDWNREQ_MASK	0x00000004U
+#define APU_3_PWRCTL_CPUPWRDWNREQ_MASK	0x00000008U
+#define IPI_RPU_MASK			0x00000100U
+
+#define UNDEFINED_CPUID		(~0)
+
+#define pm_read(addr)		Xil_In32(addr)
+#define pm_write(addr, value)	Xil_Out32(addr, value)
+#define pm_enable_int()		Xil_ExceptionEnable()
+#define pm_disable_int()	Xil_ExceptionDisable()
+
+/* Conditional debugging prints */
+#ifdef DEBUG_MODE
+	#define pm_dbg(MSG, ...) \
+		do { \
+			pm_print(MSG,##__VA_ARGS__); \
+		} while (0)
+#else
+	#define pm_dbg(MSG, ...)	{}
+#endif
+
+#ifndef bool
+	#define bool	uint8_t
+	#define true	1U
+	#define false	0U
+#endif
+
+void XPm_ClientSuspend(const struct XPm_Master *const master);
+void XPm_ClientAbortSuspend(void);
+void XPm_ClientWakeup(const struct XPm_Master *const master);
+
+/* Do not modify below this line */
+extern const enum XPmNodeId subsystem_node;
+extern const struct XPm_Master *primary_master;
+
 #endif /* _PM_COMMON_H_ */
diff --git a/lib/sw_services/xilpm/src/rpu/pm_client.h b/lib/sw_services/xilpm/src/rpu/pm_client.h
index 8cf9b9c6..141ee7a9 100644
--- a/lib/sw_services/xilpm/src/rpu/pm_client.h
+++ b/lib/sw_services/xilpm/src/rpu/pm_client.h
@@ -49,42 +49,10 @@
 
 #define MASTER_PWRCTL		RPU_RPU_0_PWRDWN
 
-#define IPI_RPU_MASK		0x00000100U
-
 #define IPI_TRIG_OFFSET		0x00010000
 #define IPI_OBS_OFFSET		0x00010004
 
-#define UNDEFINED_CPUID		(~0)
-
-#define pm_read(addr)		Xil_In32(addr)
-#define pm_write(addr, value)	Xil_Out32(addr, value)
-#define pm_enable_int()		Xil_ExceptionEnable()
-#define pm_disable_int()	Xil_ExceptionDisable()
 #define pm_print(MSG, ...)	xil_printf("RPU: "MSG,##__VA_ARGS__)
 #define pm_this_cpuid()		0U
 
-/* Conditional debugging prints */
-#ifdef DEBUG_MODE
-	#define pm_dbg(MSG, ...) \
-		do { \
-			pm_print(MSG,##__VA_ARGS__); \
-		} while (0)
-#else
-	#define pm_dbg(MSG, ...)	{}
-#endif
-
-#ifndef bool
-	#define bool	uint8_t
-	#define true	1U
-	#define false	0U
-#endif
-
-void XPm_ClientSuspend(const struct XPm_Master *const master);
-void XPm_ClientAbortSuspend(void);
-void XPm_ClientWakeup(const struct XPm_Master *const master);
-
-/* Do not modify below this line */
-extern const enum XPmNodeId subsystem_node;
-extern const struct XPm_Master *primary_master;
-
 #endif /* _PM_CLIENT_H_ */