From c2b43afc547b390d0b45aae0802af0479edaf0e5 Mon Sep 17 00:00:00 2001
From: Achin Gupta <achin.gupta@arm.com>
Date: Thu, 31 Oct 2013 11:27:43 +0000
Subject: [PATCH] move timer #defines & remove duplicate declaration

This patch removes the duplicate declaration of psci_cpu_on in psci.h
and moves the constants for the system level implementation of the
generic timer from arch_helpers.h to arch.h. All other architectural
constants are defined in arch.h so there is no need to add them to
arch_helpers.h

Change-Id: Ia8ad3f91854f7e57fce31873773eede55c384ff1
---
 include/aarch64/arch.h         | 10 ++++++++++
 include/aarch64/arch_helpers.h | 10 ----------
 include/psci.h                 |  3 ---
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/include/aarch64/arch.h b/include/aarch64/arch.h
index 143dc6c58..4548926ce 100644
--- a/include/aarch64/arch.h
+++ b/include/aarch64/arch.h
@@ -70,6 +70,16 @@
  ******************************************************************************/
 #define CPUECTLR_EL1	S3_1_C15_C2_1
 
+/*******************************************************************************
+ * Generic timer memory mapped registers & offsets
+ ******************************************************************************/
+#define CNTCR_OFF			0x000
+#define CNTFID_OFF			0x020
+
+#define CNTCR_EN			(1 << 0)
+#define CNTCR_HDBG			(1 << 1)
+#define CNTCR_FCREQ(x)			(1 << (8 + (x)))
+
 /*******************************************************************************
  * System register bit definitions
  ******************************************************************************/
diff --git a/include/aarch64/arch_helpers.h b/include/aarch64/arch_helpers.h
index 85c048124..12ab570ef 100644
--- a/include/aarch64/arch_helpers.h
+++ b/include/aarch64/arch_helpers.h
@@ -33,16 +33,6 @@
 
 #include <arch.h>
 
-/*******************************************************************************
- * Generic timer memory mapped registers & offsets
- ******************************************************************************/
-#define CNTCR_OFF			0x000
-#define CNTFID_OFF			0x020
-
-#define CNTCR_EN			(1 << 0)
-#define CNTCR_HDBG			(1 << 1)
-#define CNTCR_FCREQ(x)			(1 << (8 + (x)))
-
 #ifndef __ASSEMBLY__
 
 /*******************************************************************************
diff --git a/include/psci.h b/include/psci.h
index 70322c482..2a033d0ce 100644
--- a/include/psci.h
+++ b/include/psci.h
@@ -143,9 +143,6 @@ typedef struct {
  * Function & Data prototypes
  ******************************************************************************/
 extern unsigned int psci_version(void);
-extern int psci_cpu_on(unsigned long,
-		       unsigned long,
-		       unsigned long);
 extern int __psci_cpu_suspend(unsigned int, unsigned long, unsigned long);
 extern int __psci_cpu_off(void);
 extern int psci_affinity_info(unsigned long, unsigned int);
-- 
GitLab