Skip to content

modules: hal_nordic: multi-instance DPPI minor fixes #81602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 4, 2024
Merged

modules: hal_nordic: multi-instance DPPI minor fixes #81602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba34d57
modules: hal_nordic: add Kconfig selecting resource header
e-rk Nov 18, 2024
12dd0e2
modules: hal_nordic: NRFX_GPPI enables GPPI on all platforms
e-rk Nov 19, 2024
572071a
modules: hal_nordic: replace LUMOS_XXAA with NRF54L_SERIES
e-rk Nov 19, 2024
b6b1a3d
dts: nordic: Add dppic0 label to nRF53 and nRF91 devices
e-rk Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ rtc1: rtc@15000 {
prescaler = <1>;
};

dppic: dppic@17000 {
dppic0: dppic: dppic@17000 {
compatible = "nordic,nrf-dppic";
reg = <0x17000 0x1000>;
status = "okay";
Expand Down
2 changes: 1 addition & 1 deletion dts/arm/nordic/nrf5340_cpunet.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
status = "okay";
};

dppic: dppic@4100f000 {
dppic0: dppic: dppic@4100f000 {
compatible = "nordic,nrf-dppic";
reg = <0x4100f000 0x1000>;
status = "okay";
Expand Down
2 changes: 1 addition & 1 deletion dts/arm/nordic/nrf91_peripherals.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ adc: adc@e000 {
#io-channel-cells = <1>;
};

dppic: dppic@17000 {
dppic0: dppic: dppic@17000 {
compatible = "nordic,nrf-dppic";
reg = <0x17000 0x1000>;
status = "okay";
Expand Down
6 changes: 2 additions & 4 deletions modules/hal_nordic/nrfx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ zephyr_library_sources(nrfx_glue.c)
zephyr_library_sources(${HELPERS_DIR}/nrfx_flag32_allocator.c)
zephyr_library_sources_ifdef(CONFIG_RETAINED_MEM_NRF_RAM_CTRL ${HELPERS_DIR}/nrfx_ram_ctrl.c)
zephyr_library_sources_ifdef(CONFIG_NRFX_GPPI ${HELPERS_DIR}/nrfx_gppi_dppi.c)
zephyr_library_sources_ifdef(CONFIG_NRFX_PPI ${HELPERS_DIR}/nrfx_gppi_ppi.c)
zephyr_library_sources_ifdef(CONFIG_NRFX_GPPI ${HELPERS_DIR}/nrfx_gppi_ppi.c)

zephyr_library_sources_ifdef(CONFIG_NRFX_PRS ${SRC_DIR}/prs/nrfx_prs.c)

Expand Down Expand Up @@ -199,9 +199,7 @@ if(CONFIG_SOC_SERIES_NRF54LX AND CONFIG_NRFX_GPPI)
zephyr_library_sources(${NRFX_DIR}/soc/interconnect/dppic_ppib/nrfx_interconnect_dppic_ppib.c)
endif()

if(CONFIG_SOC_SERIES_NRF54HX AND
(CONFIG_DT_HAS_NORDIC_NRF_DPPIC_LOCAL_ENABLED OR
CONFIG_DT_HAS_NORDIC_NRF_DPPIC_GLOBAL_ENABLED))
if(CONFIG_SOC_SERIES_NRF54HX AND CONFIG_NRFX_GPPI)
zephyr_library_sources(${HELPERS_DIR}/nrfx_gppi_dppi_ppib.c)
zephyr_library_sources(${NRFX_DIR}/soc/interconnect/apb/nrfx_interconnect_apb.c)
zephyr_library_sources(${NRFX_DIR}/soc/interconnect/ipct/nrfx_interconnect_ipct.c)
Expand Down
6 changes: 5 additions & 1 deletion modules/hal_nordic/nrfx/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ config NRFX_DPPI
config NRFX_DPPI0
bool "DPPI0 driver instance"
default y if NRFX_GPPI
depends on $(dt_nodelabel_has_compat,dppic,$(DT_COMPAT_NORDIC_NRF_DPPIC))
depends on $(dt_nodelabel_has_compat,dppic0,$(DT_COMPAT_NORDIC_NRF_DPPIC))
select NRFX_DPPI

config NRFX_DPPI00
Expand Down Expand Up @@ -1209,4 +1209,8 @@ config NRFX_PRS_BOX_4

endmenu

config NRFX_RESERVED_RESOURCES_HEADER
string
default "nrfx_config_reserved_resources.h"

endmenu # "nrfx drivers"
2 changes: 1 addition & 1 deletion modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#if defined(NRF53_SERIES)
#define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
#define NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_GROUPS
#elif defined(LUMOS_XXAA)
#elif defined(NRF54L_SERIES)
#define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
#define NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_GROUPS
#endif
Expand Down
4 changes: 3 additions & 1 deletion modules/hal_nordic/nrfx/nrfx_glue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,9 @@ void nrfx_busy_wait(uint32_t usec_to_wait);

/*------------------------------------------------------------------------------*/

#include "nrfx_config_reserved_resources.h"
#ifdef CONFIG_NRFX_RESERVED_RESOURCES_HEADER
Copy link
Member

@anangl anangl Nov 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it actually possible that this will not be defined?

Copy link
Contributor Author

@e-rk e-rk Dec 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It shouldn't be, but I was asked to add it regardless before making the PR.

#include CONFIG_NRFX_RESERVED_RESOURCES_HEADER
#endif

//------------------------------------------------------------------------------

Expand Down
Loading