commit 2ddde6d625672d6cdb37507050c76abad5624ad1
author Adam Wojasinski <adam.wojasinski@nordicsemi.no> Mon Sep 12 13:41:12 2022 +0200
committer David Hu <david.hu@arm.com> Mon Feb 20 12:02:58 2023 +0100
tree f457689113dc8c31dffd7998a13b69d93ec63e61
parent bbbba033f05ed470bf726ed453d026944cb382f6

platform: nordic_nrf: Replace deprecated enum for timer prescaler

This commit replaces deprecated nrf_timer_frequency_t enum with
new numerical value.

Change-Id: Id65381bef95469ff9da28b066108bdcf99c8773d
Signed-off-by: Adam Wojasinski <adam.wojasinski@nordicsemi.no>
Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>

platform/ext/target/lairdconnectivity/common/core/plat_test.c

diff --git a/platform/ext/target/lairdconnectivity/common/core/plat_test.c b/platform/ext/target/lairdconnectivity/common/core/plat_test.c
index c4ea2fe..5d8e3cc 100644
--- a/platform/ext/target/lairdconnectivity/common/core/plat_test.c
+++ b/platform/ext/target/lairdconnectivity/common/core/plat_test.c
@@ -39,6 +39,7 @@
 #endif
 
 #define TIMER_RELOAD_VALUE          (1*1000*1000)
+#define TIMER_FREQ_HZ               (1000000)
 
 /* Area used by psa-arch-tests to keep state. */
 #define PSA_TEST_SCRATCH_AREA_SIZE  (0x400)
@@ -47,7 +48,10 @@
 {
     nrf_timer_mode_set(TIMER, NRF_TIMER_MODE_TIMER);
     nrf_timer_bit_width_set(TIMER, NRF_TIMER_BIT_WIDTH_32);
-    nrf_timer_prescaler_set(TIMER, NRF_TIMER_FREQ_1MHz);
+    nrf_timer_prescaler_set(TIMER,
+                            NRF_TIMER_PRESCALER_CALCULATE(
+                                NRF_TIMER_BASE_FREQUENCY_GET(TIMER),
+                                TIMER_FREQ_HZ));
     nrf_timer_cc_set(TIMER, NRF_TIMER_CC_CHANNEL0, ticks);
     /* Clear the timer once event is generated. */
     nrf_timer_shorts_enable(TIMER, NRF_TIMER_SHORT_COMPARE0_CLEAR_MASK);

platform/ext/target/nordic_nrf/common/core/plat_test.c

diff --git a/platform/ext/target/nordic_nrf/common/core/plat_test.c b/platform/ext/target/nordic_nrf/common/core/plat_test.c
index 8b145f8..bb7538b 100644
--- a/platform/ext/target/nordic_nrf/common/core/plat_test.c
+++ b/platform/ext/target/nordic_nrf/common/core/plat_test.c
@@ -32,12 +32,16 @@
 #endif
 
 #define TIMER_RELOAD_VALUE (1*1000*1000)
+#define TIMER_FREQ_HZ      (1000000)
 
 static void timer_init(NRF_TIMER_Type * TIMER, uint32_t ticks)
 {
     nrf_timer_mode_set(TIMER, NRF_TIMER_MODE_TIMER);
     nrf_timer_bit_width_set(TIMER, NRF_TIMER_BIT_WIDTH_32);
-    nrf_timer_prescaler_set(TIMER, NRF_TIMER_FREQ_1MHz);
+    nrf_timer_prescaler_set(TIMER,
+                            NRF_TIMER_PRESCALER_CALCULATE(
+                                NRF_TIMER_BASE_FREQUENCY_GET(TIMER),
+                                TIMER_FREQ_HZ));
     nrf_timer_cc_set(TIMER, NRF_TIMER_CC_CHANNEL0, ticks);
     /* Clear the timer once event is generated. */
     nrf_timer_shorts_enable(TIMER, NRF_TIMER_SHORT_COMPARE0_CLEAR_MASK);