From 44aac0c3db48636bddab49b07e5ee614d0bc2564 Mon Sep 17 00:00:00 2001
From: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
Date: Wed, 20 Aug 2025 16:17:34 +0800
Subject: [PATCH] arm/armv8-r: Rename arm_arch_timer to arm_timer.

This commit renamed arm_arch_timer to arm_timer.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
---
 arch/arm/src/armv8-r/CMakeLists.txt                 |  2 +-
 arch/arm/src/armv8-r/Make.defs                      |  2 +-
 .../src/armv8-r/{arm_arch_timer.c => arm_timer.c}   |  4 ++--
 .../src/armv8-r/{arm_arch_timer.h => arm_timer.h}   | 13 +++++++++----
 4 files changed, 13 insertions(+), 8 deletions(-)
 rename arch/arm/src/armv8-r/{arm_arch_timer.c => arm_timer.c} (99%)
 rename arch/arm/src/armv8-r/{arm_arch_timer.h => arm_timer.h} (89%)

diff --git a/arch/arm/src/armv8-r/CMakeLists.txt b/arch/arm/src/armv8-r/CMakeLists.txt
index 36c019dcefe..23dcc0fd033 100644
--- a/arch/arm/src/armv8-r/CMakeLists.txt
+++ b/arch/arm/src/armv8-r/CMakeLists.txt
@@ -33,7 +33,7 @@ list(APPEND SRCS arm_head.S arm_vectors.S arm_saveusercontext.S)
 list(
   APPEND
   SRCS
-  arm_arch_timer.c
+  arm_timer.c
   arm_cache.c
   arm_cpuinfo.c
   arm_dataabort.c
diff --git a/arch/arm/src/armv8-r/Make.defs b/arch/arm/src/armv8-r/Make.defs
index 0735cbf5547..8883d8e55f4 100644
--- a/arch/arm/src/armv8-r/Make.defs
+++ b/arch/arm/src/armv8-r/Make.defs
@@ -31,7 +31,7 @@ HEAD_ASRC += arm_vectortab.S
 
 # Common assembly language files
 
-CMN_CSRCS += arm_arch_timer.c arm_cache.c arm_cpuinfo.c arm_dataabort.c
+CMN_CSRCS += arm_timer.c arm_cache.c arm_cpuinfo.c arm_dataabort.c
 CMN_CSRCS += arm_doirq.c arm_gicv3.c
 CMN_CSRCS += arm_initialstate.c arm_prefetchabort.c
 CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c
diff --git a/arch/arm/src/armv8-r/arm_arch_timer.c b/arch/arm/src/armv8-r/arm_timer.c
similarity index 99%
rename from arch/arm/src/armv8-r/arm_arch_timer.c
rename to arch/arm/src/armv8-r/arm_timer.c
index 6ec70af6740..1e769f40ea3 100644
--- a/arch/arm/src/armv8-r/arm_arch_timer.c
+++ b/arch/arm/src/armv8-r/arm_timer.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv8-r/arm_arch_timer.c
+ * arch/arm/src/armv8-r/arm_timer.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -37,7 +37,7 @@
 #include <nuttx/timers/arch_alarm.h>
 
 #include "arm_gic.h"
-#include "arm_arch_timer.h"
+#include "arm_timer.h"
 
 /****************************************************************************
  * Private Types
diff --git a/arch/arm/src/armv8-r/arm_arch_timer.h b/arch/arm/src/armv8-r/arm_timer.h
similarity index 89%
rename from arch/arm/src/armv8-r/arm_arch_timer.h
rename to arch/arm/src/armv8-r/arm_timer.h
index 21c8ce4aa58..5c76c9823fa 100644
--- a/arch/arm/src/armv8-r/arm_arch_timer.h
+++ b/arch/arm/src/armv8-r/arm_timer.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv8-r/arm_arch_timer.h
+ * arch/arm/src/armv8-r/arm_timer.h
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_ARMV8_R_ARM_ARCH_TIMER_H
-#define __ARCH_ARM_SRC_ARMV8_R_ARM_ARCH_TIMER_H
+#ifndef __ARCH_ARM_SRC_ARMV8_R_ARM_TIMER_H
+#define __ARCH_ARM_SRC_ARMV8_R_ARM_TIMER_H
 
 /****************************************************************************
  * Included Files
@@ -57,4 +57,9 @@
 void arm_arch_timer_secondary_init(void);
 #endif
 
-#endif /* __ARCH_ARM_SRC_ARMV8_R_ARM_ARCH_TIMER_H */
+static inline uint64_t arm_arch_timer_get_cntfrq(void)
+{
+  return CP15_GET(CNTFRQ);
+}
+
+#endif /* __ARCH_ARM_SRC_ARMV8_R_ARM_TIMER_H */