Skip to content

Commit 458448f

Browse files
nordic-krchnordic-krch
committed
modules: hal_nordic: Cleanup after GPPI update
Remove references to legacy PPI system resources. Signed-off-by: Krzysztof Chruściński <[email protected]>
1 parent db5a67a commit 458448f

File tree

4 files changed

+5
-266
lines changed

4 files changed

+5
-266
lines changed

‎modules/hal_nordic/nrfx/CMakeLists.txt‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -127,17 +127,10 @@ zephyr_library_sources(nrfx_glue.c)
127127
zephyr_library_sources(${HELPERS_DIR}/nrfx_flag32_allocator.c)
128128
zephyr_library_sources_ifdef(CONFIG_HAS_NORDIC_RAM_CTRL ${HELPERS_DIR}/nrfx_ram_ctrl.c)
129129

130-
if(CONFIG_NRFX_GPPI)
131-
zephyr_library_sources_ifdef(CONFIG_NRFX_GPPI_V1 ${HELPERS_DIR}/internal/nrfx_gppiv1_shim.c)
132-
if(CONFIG_HAS_HW_NRF_PPI)
133-
zephyr_library_sources_ifdef(CONFIG_NRFX_GPPI_V1 ${HELPERS_DIR}/internal/nrfx_gppiv1_ppi.c)
134-
zephyr_library_sources_ifdef(CONFIG_NRFX_GPPI_V1 ${HELPERS_DIR}/internal/nrfx_ppi.c)
135-
zephyr_library_sources_ifndef(CONFIG_NRFX_GPPI_V1 ${HELPERS_DIR}/nrfx_gppi_ppi.c)
136-
else()
137-
zephyr_library_sources_ifdef(CONFIG_NRFX_GPPI_V1 ${HELPERS_DIR}/internal/nrfx_gppiv1_dppi.c)
138-
zephyr_library_sources_ifndef(CONFIG_NRFX_GPPI_V1 ${HELPERS_DIR}/nrfx_gppi_dppi.c)
139-
zephyr_library_sources_ifdef(CONFIG_NRFX_GPPI_V1 ${HELPERS_DIR}/internal/nrfx_dppi.c)
140-
endif()
130+
if(CONFIG_NRFX_GPPI AND NOT CONFIG_NRFX_GPPI_V1)
131+
zephyr_library_sources_ifdef(CONFIG_HAS_HW_NRF_PPI ${HELPERS_DIR}/nrfx_gppi_ppi.c)
132+
zephyr_library_sources_ifdef(CONFIG_HAS_HW_NRF_DPPIC ${HELPERS_DIR}/nrfx_gppi_dppi.c)
133+
zephyr_library_sources_ifdef(CONFIG_SOC_COMPATIBLE_NRF54LX ${HELPERS_DIR}/nrfx_gppi_lumos.c)
141134
endif()
142135

143136
zephyr_library_sources_ifdef(CONFIG_NRFX_PRS ${SRC_DIR}/prs/nrfx_prs.c)
@@ -219,14 +212,9 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LX_DISABLE_FICR_TRIMCNF NRF_DIS
219212
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LX_SKIP_GLITCHDETECTOR_DISABLE NRF_SKIP_GLITCHDETECTOR_DISABLE)
220213
zephyr_compile_definitions_ifndef(CONFIG_SOC_NRF54L_ANOMALY_56_WORKAROUND NRF54L_CONFIGURATION_56_ENABLE=0)
221214

222-
if(CONFIG_SOC_COMPATIBLE_NRF54LX AND CONFIG_NRFX_GPPI)
223-
zephyr_library_sources_ifdef(CONFIG_NRFX_GPPI_V1 ${HELPERS_DIR}/internal/nrfx_gppiv1_ppib.c)
224-
zephyr_library_sources_ifdef(CONFIG_NRFX_GPPI_V1 ${HELPERS_DIR}/internal/nrfx_ppib.c)
225-
zephyr_library_sources_ifndef(CONFIG_NRFX_GPPI_V1 ${HELPERS_DIR}/nrfx_gppi_lumos.c)
226-
endif()
227-
228215
if(CONFIG_SOC_SERIES_NRF54HX AND CONFIG_NRFX_GPPI_V1)
229216
zephyr_library_sources(${HELPERS_DIR}/internal/nrfx_gppiv1_ipct.c)
217+
zephyr_library_sources(${HELPERS_DIR}/internal/nrfx_gppiv1_shim.c)
230218
endif()
231219

232220

‎modules/hal_nordic/nrfx/Kconfig‎

Lines changed: 0 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -56,93 +56,6 @@ config NRFX_CRACEN
5656
bool "CRACEN drivers"
5757
depends on SOC_COMPATIBLE_NRF54LX
5858

59-
config NRFX_DPPI
60-
bool
61-
62-
config NRFX_DPPI0
63-
bool "DPPI0 driver instance"
64-
default y if NRFX_GPPI_V1
65-
depends on $(dt_nodelabel_exists,dppic0)
66-
select NRFX_DPPI
67-
68-
config NRFX_DPPI00
69-
bool "DPPI00 driver instance"
70-
default y if NRFX_GPPI_V1
71-
depends on $(dt_nodelabel_exists,dppic00)
72-
select NRFX_DPPI
73-
74-
config NRFX_DPPI10
75-
bool "DPPI10 driver instance"
76-
default y if NRFX_GPPI_V1
77-
depends on $(dt_nodelabel_exists,dppic10)
78-
select NRFX_DPPI
79-
80-
config NRFX_DPPI20
81-
bool "DPPI20 driver instance"
82-
default y if NRFX_GPPI_V1
83-
depends on $(dt_nodelabel_exists,dppic20)
84-
select NRFX_DPPI
85-
86-
config NRFX_DPPI30
87-
bool "DPPI30 driver instance"
88-
default y if NRFX_GPPI_V1
89-
depends on $(dt_nodelabel_exists,dppic30)
90-
select NRFX_DPPI
91-
92-
config NRFX_DPPI020
93-
bool "DPPI020 driver instance"
94-
default y if NRFX_GPPI_V1
95-
depends on $(dt_nodelabel_exists,dppic020)
96-
select NRFX_DPPI
97-
98-
config NRFX_DPPI120
99-
bool "DPPI120 driver instance"
100-
default y if NRFX_GPPI_V1
101-
depends on $(dt_nodelabel_exists,dppic120)
102-
select NRFX_DPPI
103-
104-
config NRFX_DPPI130
105-
bool "DPPI130 driver instance"
106-
default y if NRFX_GPPI_V1
107-
depends on $(dt_nodelabel_exists,dppic130)
108-
select NRFX_DPPI
109-
110-
config NRFX_DPPI131
111-
bool "DPPI131 driver instance"
112-
default y if NRFX_GPPI_V1
113-
depends on $(dt_nodelabel_exists,dppic131)
114-
select NRFX_DPPI
115-
116-
config NRFX_DPPI132
117-
bool "DPPI132 driver instance"
118-
default y if NRFX_GPPI_V1
119-
depends on $(dt_nodelabel_exists,dppic132)
120-
select NRFX_DPPI
121-
122-
config NRFX_DPPI133
123-
bool "DPPI133 driver instance"
124-
default y if NRFX_GPPI_V1
125-
depends on $(dt_nodelabel_exists,dppic133)
126-
select NRFX_DPPI
127-
128-
config NRFX_DPPI134
129-
bool "DPPI134 driver instance"
130-
default y if NRFX_GPPI_V1
131-
depends on $(dt_nodelabel_exists,dppic134)
132-
select NRFX_DPPI
133-
134-
config NRFX_DPPI135
135-
bool "DPPI135 driver instance"
136-
default y if NRFX_GPPI_V1
137-
depends on $(dt_nodelabel_exists,dppic135)
138-
select NRFX_DPPI
139-
140-
config NRFX_DPPI136
141-
bool "DPPI136 driver instance"
142-
default y if NRFX_GPPI_V1
143-
depends on $(dt_nodelabel_exists,dppic136)
144-
select NRFX_DPPI
145-
14659
config NRFX_EGU
14760
bool
14861

@@ -292,62 +205,6 @@ config NRFX_POWER
292205
# internally the USBREG driver.
293206
select NRFX_USBREG if $(dt_nodelabel_exists,usbreg)
294207

295-
config NRFX_PPI
296-
bool "PPI allocator"
297-
default y if NRFX_GPPI_V1
298-
depends on $(dt_nodelabel_exists,ppi)
299-
300-
config NRFX_PPIB
301-
bool
302-
303-
config NRFX_PPIB00
304-
bool "PPIB00 driver instance"
305-
default y if NRFX_GPPI_V1
306-
depends on $(dt_nodelabel_exists,ppib00)
307-
select NRFX_PPIB
308-
309-
config NRFX_PPIB01
310-
bool "PPIB01 driver instance"
311-
default y if NRFX_GPPI_V1
312-
depends on $(dt_nodelabel_exists,ppib01)
313-
select NRFX_PPIB
314-
315-
config NRFX_PPIB10
316-
bool "PPIB10 driver instance"
317-
default y if NRFX_GPPI_V1
318-
depends on $(dt_nodelabel_exists,ppib10)
319-
select NRFX_PPIB
320-
321-
config NRFX_PPIB11
322-
bool "PPIB11 driver instance"
323-
default y if NRFX_GPPI_V1
324-
depends on $(dt_nodelabel_exists,ppib11)
325-
select NRFX_PPIB
326-
327-
config NRFX_PPIB20
328-
bool "PPIB20 driver instance"
329-
default y if NRFX_GPPI_V1
330-
depends on $(dt_nodelabel_exists,ppib20)
331-
select NRFX_PPIB
332-
333-
config NRFX_PPIB21
334-
bool "PPIB21 driver instance"
335-
default y if NRFX_GPPI_V1
336-
depends on $(dt_nodelabel_exists,ppib21)
337-
select NRFX_PPIB
338-
339-
config NRFX_PPIB22
340-
bool "PPIB22 driver instance"
341-
default y if NRFX_GPPI_V1
342-
depends on $(dt_nodelabel_exists,ppib22)
343-
select NRFX_PPIB
344-
345-
config NRFX_PPIB30
346-
bool "PPIB30 driver instance"
347-
default y if NRFX_GPPI_V1
348-
depends on $(dt_nodelabel_exists,ppib30)
349-
select NRFX_PPIB
350-
351208
config NRFX_PWM
352209
bool "PWM driver"
353210

‎modules/hal_nordic/nrfx/Kconfig.logging‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ config NRFX_COMP_LOG
1616
bool "COMP driver logging"
1717
depends on NRFX_COMP
1818

19-
config NRFX_DPPI_LOG
20-
bool "DPPI driver logging"
21-
depends on NRFX_DPPI
22-
2319
config NRFX_EGU_LOG
2420
bool "EGU driver logging"
2521
depends on NRFX_EGU
@@ -64,14 +60,6 @@ config NRFX_POWER_LOG
6460
bool "POWER driver logging"
6561
depends on NRFX_POWER
6662

67-
config NRFX_PPI_LOG
68-
bool "PPI driver logging"
69-
depends on NRFX_PPI
70-
71-
config NRFX_PPIB_LOG
72-
bool "PPIB driver logging"
73-
depends on NRFX_PPIB
74-
7563
config NRFX_PRS_LOG
7664
bool "PRS driver logging"
7765
depends on NRFX_PRS

‎modules/hal_nordic/nrfx/nrfx_kconfig.h‎

Lines changed: 0 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -82,55 +82,6 @@
8282
#define NRFX_CRACEN_ENABLED 1
8383
#endif
8484

85-
#ifdef CONFIG_NRFX_DPPI
86-
#define NRFX_DPPI_ENABLED 1
87-
#endif
88-
#ifdef CONFIG_NRFX_DPPI_LOG
89-
#define NRFX_DPPI_CONFIG_LOG_ENABLED 1
90-
#endif
91-
#ifdef CONFIG_NRFX_DPPI0
92-
#define NRFX_DPPI0_ENABLED 1
93-
#endif
94-
#ifdef CONFIG_NRFX_DPPI00
95-
#define NRFX_DPPI00_ENABLED 1
96-
#endif
97-
#ifdef CONFIG_NRFX_DPPI10
98-
#define NRFX_DPPI10_ENABLED 1
99-
#endif
100-
#ifdef CONFIG_NRFX_DPPI20
101-
#define NRFX_DPPI20_ENABLED 1
102-
#endif
103-
#ifdef CONFIG_NRFX_DPPI30
104-
#define NRFX_DPPI30_ENABLED 1
105-
#endif
106-
#ifdef CONFIG_NRFX_DPPI020
107-
#define NRFX_DPPI020_ENABLED 1
108-
#endif
109-
#ifdef CONFIG_NRFX_DPPI120
110-
#define NRFX_DPPI120_ENABLED 1
111-
#endif
112-
#ifdef CONFIG_NRFX_DPPI130
113-
#define NRFX_DPPI130_ENABLED 1
114-
#endif
115-
#ifdef CONFIG_NRFX_DPPI131
116-
#define NRFX_DPPI131_ENABLED 1
117-
#endif
118-
#ifdef CONFIG_NRFX_DPPI132
119-
#define NRFX_DPPI132_ENABLED 1
120-
#endif
121-
#ifdef CONFIG_NRFX_DPPI133
122-
#define NRFX_DPPI133_ENABLED 1
123-
#endif
124-
#ifdef CONFIG_NRFX_DPPI134
125-
#define NRFX_DPPI134_ENABLED 1
126-
#endif
127-
#ifdef CONFIG_NRFX_DPPI135
128-
#define NRFX_DPPI135_ENABLED 1
129-
#endif
130-
#ifdef CONFIG_NRFX_DPPI136
131-
#define NRFX_DPPI136_ENABLED 1
132-
#endif
133-
13485
#ifdef CONFIG_NRFX_EGU
13586
#define NRFX_EGU_ENABLED 1
13687
#endif
@@ -274,44 +225,6 @@
274225
#define NRFX_POWER_CONFIG_LOG_ENABLED 1
275226
#endif
276227

277-
#ifdef CONFIG_NRFX_PPI
278-
#define NRFX_PPI_ENABLED 1
279-
#endif
280-
#ifdef CONFIG_NRFX_PPI_LOG
281-
#define NRFX_PPI_CONFIG_LOG_ENABLED 1
282-
#endif
283-
284-
#ifdef CONFIG_NRFX_PPIB
285-
#define NRFX_PPIB_ENABLED 1
286-
#endif
287-
#ifdef CONFIG_NRFX_PPIB_LOG
288-
#define NRFX_PPIB_CONFIG_LOG_ENABLED 1
289-
#endif
290-
#ifdef CONFIG_NRFX_PPIB00
291-
#define NRFX_PPIB00_ENABLED 1
292-
#endif
293-
#ifdef CONFIG_NRFX_PPIB01
294-
#define NRFX_PPIB01_ENABLED 1
295-
#endif
296-
#ifdef CONFIG_NRFX_PPIB10
297-
#define NRFX_PPIB10_ENABLED 1
298-
#endif
299-
#ifdef CONFIG_NRFX_PPIB11
300-
#define NRFX_PPIB11_ENABLED 1
301-
#endif
302-
#ifdef CONFIG_NRFX_PPIB20
303-
#define NRFX_PPIB20_ENABLED 1
304-
#endif
305-
#ifdef CONFIG_NRFX_PPIB21
306-
#define NRFX_PPIB21_ENABLED 1
307-
#endif
308-
#ifdef CONFIG_NRFX_PPIB22
309-
#define NRFX_PPIB22_ENABLED 1
310-
#endif
311-
#ifdef CONFIG_NRFX_PPIB30
312-
#define NRFX_PPIB30_ENABLED 1
313-
#endif
314-
315228
#ifdef CONFIG_NRFX_PRS
316229
#define NRFX_PRS_ENABLED 1
317230
#endif
@@ -546,13 +459,6 @@
546459
CONFIG_NRF52_ANOMALY_109_WORKAROUND_EGU_INSTANCE
547460
#endif
548461

549-
#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_dppic_global) || \
550-
DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_dppic_local)
551-
#ifndef NRFX_DPPI_ENABLED
552-
#define NRFX_DPPI_ENABLED 1
553-
#endif
554-
#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_dppic_global) || ... */
555-
556462
/* If local or global DPPIC peripherals are used, provide the following macro
557463
* definitions required by the interconnect/ipct layer:
558464
* - NRFX_IPCTx_PUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num)

0 commit comments

Comments
 (0)