aboutsummaryrefslogtreecommitdiffstats
path: root/plat/arm
diff options
context:
space:
mode:
authorAntonio Niño Díaz <antonio.ninodiaz@arm.com>2018-11-26 11:51:57 +0100
committerGitHub <noreply@github.com>2018-11-26 11:51:57 +0100
commit85397ec4574952de8878ee053e01b1a04b34035f (patch)
tree83a930ce885afdcda5ea1f73f8b325c5e5f6c147 /plat/arm
parent98aab97484b27e40aa74a93e5d1c1ac037a7e0b8 (diff)
parent932b3ae2324780b6ecdf0ca00147ef90a1854911 (diff)
downloadplatform_external_arm-trusted-firmware-85397ec4574952de8878ee053e01b1a04b34035f.tar.gz
platform_external_arm-trusted-firmware-85397ec4574952de8878ee053e01b1a04b34035f.tar.bz2
platform_external_arm-trusted-firmware-85397ec4574952de8878ee053e01b1a04b34035f.zip
Merge pull request #1697 from antonio-nino-diaz-arm/an/arch
Synchronise arch.h and arch_helpers.h with TF-A-Tests
Diffstat (limited to 'plat/arm')
-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 b72dd201a..56ad8aeeb 100644
--- a/plat/arm/common/arm_common.c
+++ b/plat/arm/common/arm_common.c
@@ -128,10 +128,10 @@ void arm_configure_sys_timer(void)
/*
* Initialize CNTFRQ register in Non-secure CNTBase frame.
* This is only required for Juno, because it doesn't follow ARM ARM
- * in that the value updated in CNTFRQ is not reflected in CNTBASE_CNTFRQ.
- * Hence update the value manually.
+ * in that the value updated in CNTFRQ is not reflected in
+ * CNTBASEN_CNTFRQ. Hence update the value manually.
*/
- mmio_write_32(ARM_SYS_CNT_BASE_NS + CNTBASE_CNTFRQ, freq_val);
+ mmio_write_32(ARM_SYS_CNT_BASE_NS + CNTBASEN_CNTFRQ, freq_val);
#endif
}
#endif /* ARM_SYS_TIMCTL_BASE */