summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJun Nie <jun.nie@linaro.org>2018-08-24 00:18:12 +0800
committerJun Nie <jun.nie@linaro.org>2018-08-24 00:23:03 +0800
commit215c703dda923d1ae82d79d3469f2c727686ef94 (patch)
tree0adcaa31d8ec95a07879ab8d2ec2903b637e45da
parent28ec993e1b4ee0c34b24ff384339acb324f290f6 (diff)
warp7: correct system counter register address
Correct system counter register address. So that framework can call it directly to get latest counter value. Signed-off-by: Jun Nie <jun.nie@linaro.org>
-rw-r--r--plat/nxp/board/warp7/include/platform_def.h5
-rw-r--r--plat/nxp/common/nxp_timers.c2
2 files changed, 2 insertions, 5 deletions
diff --git a/plat/nxp/board/warp7/include/platform_def.h b/plat/nxp/board/warp7/include/platform_def.h
index a5b06aa..d5adfcb 100644
--- a/plat/nxp/board/warp7/include/platform_def.h
+++ b/plat/nxp/board/warp7/include/platform_def.h
@@ -62,11 +62,8 @@
/* Base address of non-trusted watchdog */
#define IMX7S_WDOG_BASE 0x30280000
-/* GP Timer base */
-#define GPT1_BASE_ADDR (AIPS1_BASE + 0x2d0000)
-
/* Memory mapped Generic timer(system counter) interfaces. */
-#define SYS_CNT_BASE1 0x306c0000
+#define SYS_CNT_BASE1 (AIPS2_BASE + 0x2c0000)
/* Size of a block as mapped by a second-level translation table */
#define L2_BLOCK_SIZE 0x80000
diff --git a/plat/nxp/common/nxp_timers.c b/plat/nxp/common/nxp_timers.c
index 6ef5fca..b9d9f12 100644
--- a/plat/nxp/common/nxp_timers.c
+++ b/plat/nxp/common/nxp_timers.c
@@ -50,7 +50,7 @@ int plat_initialise_timer_ops(const plat_timer_t **timer_ops)
*timer_ops = &plat_timers;
/* Initialise the system timer */
- init_systimer(GPT1_BASE_ADDR);
+ init_systimer(SYS_CNT_BASE1);
return 0;
}