Skip to content

Commit 9f592f3

Browse files
committed
samples: peripherals: radio_test: update errata 20
Update errata 20 checks to use NRF_ERRATA_STATIC_CHECK and NRF_ERRATA_DYNAMIC_CHECK macros instead of calling MDK functions directly. Remove the obsolete nRF54LS05B-specific workaround since nrfx errata 20 now covers that chip. Ported from sdk-nrf commits 818588a6c5 and 5bc2a43bf2. Signed-off-by: Ivan Iushkov <ivan.iushkov@nordicsemi.no>
1 parent e556dd4 commit 9f592f3

1 file changed

Lines changed: 5 additions & 14 deletions

File tree

  • samples/peripherals/radio_test/src

samples/peripherals/radio_test/src/main.c

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,9 @@
88
#include <bm/shell/backend_bm_uarte.h>
99
#include <nrfx.h>
1010
#include <hal/nrf_clock.h>
11-
/* TODO: DRGN-27733 Remove the alternative condition for nRF54LS05B
12-
* when the errata has been applied to this chip and the errata
13-
* check can be used instead.
14-
*/
15-
#if NRF54L_ERRATA_20_PRESENT || defined(NRF54LS05B_ENGA_XXAA)
11+
#if NRF_ERRATA_STATIC_CHECK(54L, 20)
1612
#include <hal/nrf_power.h>
17-
#endif /* NRF54L_ERRATA_20_PRESENT */
13+
#endif /* NRF_ERRATA_STATIC_CHECK(54L, 20) */
1814

1915
#include "radio_test.h"
2016

@@ -29,16 +25,11 @@ static void clock_init(void)
2925
}
3026
nrf_clock_event_clear(NRF_CLOCK, NRF_CLOCK_EVENT_HFCLKSTARTED);
3127

32-
#if NRF54L_ERRATA_20_PRESENT
33-
if (nrf54l_errata_20()) {
28+
#if NRF_ERRATA_STATIC_CHECK(54L, 20)
29+
if (NRF_ERRATA_DYNAMIC_CHECK(54L, 20)) {
3430
nrf_power_task_trigger(NRF_POWER, NRF_POWER_TASK_CONSTLAT);
3531
}
36-
/* TODO: DRGN-27733 Remove the elif block for nRF54LS05B when the errata has
37-
* been applied to this chip and the errata check can be used instead.
38-
*/
39-
#elif defined(NRF54LS05B_ENGA_XXAA)
40-
nrf_power_task_trigger(NRF_POWER, NRF_POWER_TASK_CONSTLAT);
41-
#endif /* NRF54L_ERRATA_20_PRESENT */
32+
#endif /* NRF_ERRATA_STATIC_CHECK(54L, 20) */
4233

4334
#if defined(NRF54LM20A_XXAA)
4435
/* MLTPAN-39 */

0 commit comments

Comments
 (0)