Skip to content

Commit 0cadaf1

Browse files
jori-nordicanangl
authored andcommitted
[nrf fromlist] hal_nordic: Fix reserved PPI faulty logic
The list of reserved PPIs by MPSL should be kept if MPSL is enabled. The 802154 radio driver is not the only user of MPSL. Upstream PR: zephyrproject-rtos/zephyr#74139 Signed-off-by: Jonathan Rico <[email protected]>
1 parent 27c0cfd commit 0cadaf1

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

modules/hal_nordic/nrfx/Kconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ menu "nrfx drivers"
99

1010
rsource "Kconfig.logging"
1111

12+
config MPSL
13+
bool
14+
# Dummy kconfig to allow compiling outside of NCS
15+
1216
config NRFX_ADC
1317
bool "ADC driver"
1418
depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_ADC))

modules/hal_nordic/nrfx/nrfx_glue.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ void nrfx_busy_wait(uint32_t usec_to_wait);
378378
#define NRFX_PPI_GROUPS_USED_BY_802154_DRV 0
379379
#endif // CONFIG_NRF_802154_RADIO_DRIVER
380380

381-
#if defined(CONFIG_NRF_802154_RADIO_DRIVER) && !defined(CONFIG_NRF_802154_SL_OPENSOURCE)
381+
#if defined(CONFIG_MPSL)
382382
#include <mpsl.h>
383383
#define NRFX_PPI_CHANNELS_USED_BY_MPSL MPSL_RESERVED_PPI_CHANNELS
384384
#define NRFX_PPI_GROUPS_USED_BY_MPSL 0

0 commit comments

Comments
 (0)