Skip to content

Commit b89900f

Browse files
committed
tmp: Add logs to gppi init
1 parent e88cd52 commit b89900f

3 files changed

Lines changed: 9 additions & 4 deletions

File tree

modules/hal_nordic/nrfx/nrfx_kconfig.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,10 @@
438438
#define NRFX_WDT_CONFIG_LOG_ENABLED 1
439439
#endif
440440

441+
#ifdef CONFIG_NRFX_GPPI_SD2PPI_GLOBAL
442+
#define NRFX_GPPI_CONFIG_DPPI_PPIB_EXT_FUNC 1
443+
#endif
444+
441445
#ifdef CONFIG_NRF52_ANOMALY_109_WORKAROUND
442446
#define NRF52_ERRATA_109_ENABLE_WORKAROUND 1
443447
#define NRFX_PWM_NRF52_ANOMALY_109_EGU_INSTANCE \

soc/nordic/common/gppi_init.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,11 @@ static int gppi_init(void)
144144
#if defined(CONFIG_NRFX_GPPI) && !defined(CONFIG_NRFX_GPPI_V1)
145145

146146
/* For nrf54h20 GPPI requires that ironside communication is up so delay the initialization. */
147-
#define GPPI_INIT_STATE COND_CODE_1(IS_ENABLED(CONFIG_SOC_NRF54H20_CPUAPP), (POST_KERNEL), (EARLY))
147+
#define GPPI_INIT_STATE \
148+
COND_CODE_1(IS_ENABLED(CONFIG_NRFX_GPPI_SD2PPI_GLOBAL), (POST_KERNEL), (EARLY))
148149

149150
#define GPPI_INIT_PRIO \
150-
COND_CODE_1(IS_ENABLED(CONFIG_SOC_NRF54H20_CPUAPP), \
151+
COND_CODE_1(IS_ENABLED(CONFIG_NRFX_GPPI_SD2PPI_GLOBAL), \
151152
(UTIL_INC(CONFIG_IRONSIDE_SE_CALL_INIT_PRIORITY)), (0))
152153

153154
SYS_INIT(gppi_init, GPPI_INIT_STATE, GPPI_INIT_PRIO);

soc/nordic/common/nrfx_gppi_sd2ppi_global.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,8 +420,8 @@ static int actual_channel_mask(nrfx_gppi_node_id_t node_id, uint32_t *ch_mask, b
420420
NRF_SPU133,
421421
NRF_SPU134,
422422
NRF_SPU135,
423-
IF_ENABLED(NRFX_INSTANCE_PRESENT(SPU136), (NRF_SPU136,))
424-
IF_ENABLED(NRFX_INSTANCE_PRESENT(SPU137), (NRF_SPU137,))
423+
IF_ENABLED(DT_NODE_EXISTS(DT_NODELABEL(dppic135)), (NRF_SPU136,))
424+
IF_ENABLED(DT_NODE_EXISTS(DT_NODELABEL(dppic136)), (NRF_SPU137,))
425425
NRF_SPU122,
426426
};
427427
uint32_t out_mask = 0;

0 commit comments

Comments
 (0)