aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadhukar Pappireddy <madhukar.pappireddy@arm.com>2021-06-01 17:07:45 +0200
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2021-06-01 17:07:45 +0200
commit73a3db718c6d0ca5066da2e8c9dd235a68eadf4a (patch)
treef9996d2d80e6db166b797948ccd8d129ac4c011e
parent906116f82974885494a9a151427c307dfd0e5bbd (diff)
parent7f2d23d9d790df90021de6c5165ef10fe5cc5590 (diff)
downloadtrusted-firmware-a-73a3db718c6d0ca5066da2e8c9dd235a68eadf4a.tar.gz
Merge "fix(morello): initialise CNTFRQ in Non Secure CNTBaseN" into integration
-rw-r--r--plat/arm/common/arm_common.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/plat/arm/common/arm_common.c b/plat/arm/common/arm_common.c
index 7d9fd6c729..946b7329fd 100644
--- a/plat/arm/common/arm_common.c
+++ b/plat/arm/common/arm_common.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2015-2021, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -151,10 +151,10 @@ void arm_configure_sys_timer(void)
*/
mmio_write_32(ARM_SYS_TIMCTL_BASE + CNTCTLBASE_CNTFRQ, freq_val);
-#if defined(PLAT_juno) || defined(PLAT_n1sdp)
+#if defined(PLAT_juno) || defined(PLAT_n1sdp) || defined(PLAT_morello)
/*
* Initialize CNTFRQ register in Non-secure CNTBase frame.
- * This is only required for Juno and N1SDP, because they do not
+ * This is required for Juno, N1SDP and Morello because they do not
* follow ARM ARM in that the value updated in CNTFRQ is not
* reflected in CNTBASEN_CNTFRQ. Hence update the value manually.
*/