Skip to content
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.

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

[nrf fromtree] Integrate nrfx 3.10.0 #2460

Closed
Closed
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
8c1001f
[nrf fromtree] soc: nordic: enable DPPI and PPIB nodes by default
e-rk Nov 28, 2024
954fb3c
[nrf fromtree] drivers: serial: nrfx_uarte: Fix endtx-stoptx property…
e-rk Nov 29, 2024
273b094
[nrf fromtree] manifest: update hal_nordic revision
ankuns Dec 23, 2024
00b754c
[nrf fromtree] modules: hal_nordic: remove setting of NRF_802154_USE_…
ankuns Jan 3, 2025
c3d95c8
[nrf fromtree] manifest: update hal_nordic
gmarull Jan 8, 2025
7c966bb
[nrf fromtree] manifest: Update hal_nordic with new cracen hal and rn…
aescolar Jan 14, 2025
b5ad20b
[nrf fromtree] manifest: update hal_nordic revision to integrate nrfx…
nika-nordic Jan 21, 2025
6dd3744
[nrf fromtree] drivers: nrfx: Avoid unhandled event calling assert fu…
mah-eiSmart Jan 17, 2025
3e78599
[nrf fromtree] drivers: clock_control: nrf: ignore XOTUNE-related eve…
nika-nordic Jan 22, 2025
e509253
Revert "[nrf fromlist] drivers: hwinfo: Support for reset reasons in …
nika-nordic Feb 4, 2025
79bce38
[nrf fromtree] drivers: hwinfo: Support for reset reasons in nRF54H20
kl-cruz Nov 22, 2024
745bf59
[nrf fromtree] modules: hal_nordic: NRFX_GPPI enables GPPI on all pla…
e-rk Nov 19, 2024
254cc2b
[nrf fromtree] modules: hal_nordic: nrfx: Add missing GPIOTE logging …
awojasinski Dec 19, 2024
b9cc89e
[nrf fromtree] modules: hal_nordic: nrfx: Compile NRFX_GPPI modules f…
rugeGerritsen Dec 20, 2024
7675981
[nrf fromtree] soc: nordic: nrf54l: Add nrf54l09 enga SoC
nordic-krch Nov 29, 2024
c3dec90
[nrf fromtree] modules: hal_nordic: nrfx_config: Customize NRFX_SPIM_…
nordic-krch Dec 4, 2024
02bf231
Revert "[nrf noup] modules: hal_nordic: adjust nrfx reservations to NCS"
nika-nordic Feb 11, 2025
26207d0
[nrf fromtree] modules: hal_nordic: nrfx: use templates from hal_nordic
masz-nordic Nov 20, 2024
8380653
[nrf fromtree] modules: hal_nordic: nrfx: cleanup
masz-nordic Nov 20, 2024
6c5c154
[nrf noup] modules: hal_nordic: adjust nrfx reservations to NCS
e-rk Oct 22, 2024
23a9366
[nrf noup] modules: hal_nordic: use Kconfig symbols in NCS reservation
nika-nordic Feb 12, 2025
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
Prev Previous commit
[nrf noup] modules: hal_nordic: use Kconfig symbols in NCS reservation
As nrfx_config is included before MDK, MDK-specific device symbols
cannot be used. Use Kconfig symbols instead.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
  • Loading branch information
nika-nordic committed Feb 12, 2025

Verified

This commit was signed with the committer’s verified signature. The key has expired.
danny-avila Danny Avila
commit 23a93667da671681533f18da3743483ed4bd9de4
59 changes: 40 additions & 19 deletions modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h
Original file line number Diff line number Diff line change
@@ -31,6 +31,19 @@
*/
#define NRFX_TIMERS_USED 0

/* If the GRTC system timer driver is to be used, prepare definitions required
* by the nrfx_grtc driver (NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK and
* NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS) based on information from devicetree.
*/
#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_grtc)
#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK \
(NRFX_CONFIG_MASK_DT(DT_INST(0, nordic_nrf_grtc), owned_channels) & \
~NRFX_CONFIG_MASK_DT(DT_INST(0, nordic_nrf_grtc), child_owned_channels))
#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS \
(DT_PROP_LEN_OR(DT_INST(0, nordic_nrf_grtc), owned_channels, 0) - \
DT_PROP_LEN_OR(DT_INST(0, nordic_nrf_grtc), child_owned_channels, 0))

Check notice on line 44 in modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change

modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h:44 -#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK \ - (NRFX_CONFIG_MASK_DT(DT_INST(0, nordic_nrf_grtc), owned_channels) & \ +#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK \ + (NRFX_CONFIG_MASK_DT(DT_INST(0, nordic_nrf_grtc), owned_channels) & \ ~NRFX_CONFIG_MASK_DT(DT_INST(0, nordic_nrf_grtc), child_owned_channels)) -#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS \ - (DT_PROP_LEN_OR(DT_INST(0, nordic_nrf_grtc), owned_channels, 0) - \ +#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS \ + (DT_PROP_LEN_OR(DT_INST(0, nordic_nrf_grtc), owned_channels, 0) - \
#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_grtc) */

/*
* The enabled Bluetooth controller subsystem is responsible for providing
* definitions of the BT_CTLR_USED_* symbols used below in a file named
@@ -40,32 +53,40 @@
*/
#if defined(CONFIG_BT_LL_SW_SPLIT)
#include <bt_ctlr_used_resources.h>
#if defined(DPPI_PRESENT)
#if defined(NRF53_SERIES)
#if defined(CONFIG_SOC_SERIES_NRF51X) || defined(CONFIG_SOC_COMPATIBLE_NRF52X)
#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_GROUPS
#elif defined(CONFIG_SOC_COMPATIBLE_NRF53X)
#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(NRF54L_SERIES)
#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
#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
#else /* defined(DPPI_PRESENT) */
#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_GROUPS
#endif /* defined(DPPI_PRESENT) */
#endif /* defined(CONFIG_BT_LL_SW_SPLIT) */

#if defined(CONFIG_BT_LL_SOFTDEVICE)
/* Define auxiliary symbols needed for SDC device dispatch. */
#if defined(CONFIG_SOC_COMPATIBLE_NRF52X)
#define NRF52_SERIES
#elif defined(CONFIG_SOC_COMPATIBLE_NRF53X)
#define NRF53_SERIES
#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
#define NRF54L_SERIES
#elif defined(CONFIG_SOC_SERIES_NRF54HX)
#define NRF54H
#endif
#include <sdc_soc.h>
#if defined(NRF52_SERIES)
#if defined(CONFIG_SOC_COMPATIBLE_NRF52X)
#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR SDC_PPI_CHANNELS_USED_MASK
#elif defined(NRF53_SERIES)
#elif defined(CONFIG_SOC_COMPATIBLE_NRF53X)
#define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR SDC_DPPI_CHANNELS_USED_MASK
#elif defined(NRF54L_SERIES)
#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
#define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC10_CHANNELS_USED_MASK
#define NRFX_DPPI00_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC00_CHANNELS_USED_MASK
#define NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR \
(SDC_PPIB00_CHANNELS_USED_MASK | SDC_PPIB10_CHANNELS_USED_MASK)
#elif defined(NRF54H_SERIES)
#elif defined(CONFIG_SOC_SERIES_NRF54HX)
#define NRFX_DPPI020_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC020_CHANNELS_USED_MASK
#define NRFX_DPPI030_CHANNELS_USED_BY_BT_CTLR SDC_DPPIC030_CHANNELS_USED_MASK
#define NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR \
@@ -76,19 +97,19 @@
#endif /* defined(CONFIG_BT_LL_SOFTDEVICE) */

#if defined(CONFIG_NRF_802154_RADIO_DRIVER)
#if defined(NRF52_SERIES)
#if defined(CONFIG_SOC_COMPATIBLE_NRF52X)
#include <../src/nrf_802154_peripherals_nrf52.h>
#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV NRF_802154_PPI_CHANNELS_USED_MASK
#define NRFX_PPI_GROUPS_USED_BY_802154_DRV NRF_802154_PPI_GROUPS_USED_MASK
#elif defined(NRF53_SERIES)
#elif defined(CONFIG_SOC_COMPATIBLE_NRF53X)
#include <../src/nrf_802154_peripherals_nrf53.h>
#define NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
#define NRFX_DPPI0_GROUPS_USED_BY_802154_DRV NRF_802154_DPPI_GROUPS_USED_MASK
#elif defined(NRF54L_SERIES)
#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
#include <../src/nrf_802154_peripherals_nrf54l.h>
#define NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
#define NRFX_DPPI10_GROUPS_USED_BY_802154_DRV NRF_802154_DPPI_GROUPS_USED_MASK
#elif defined(NRF54H_SERIES)
#elif defined(CONFIG_SOC_SERIES_NRF54HX)
#include <../src/nrf_802154_peripherals_nrf54h.h>
#define NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
#define NRFX_DPPI020_GROUPS_USED_BY_802154_DRV NRF_802154_DPPI_GROUPS_USED_MASK
@@ -99,16 +120,16 @@

#if defined(CONFIG_MPSL)
#include <mpsl.h>
#if defined(NRF52_SERIES)
#if defined(CONFIG_SOC_COMPATIBLE_NRF52X)
#define NRFX_PPI_CHANNELS_USED_BY_MPSL MPSL_PPI_CHANNELS_USED_MASK
#elif defined(NRF53_SERIES)
#elif defined(CONFIG_SOC_COMPATIBLE_NRF53X)
#define NRFX_DPPI0_CHANNELS_USED_BY_MPSL MPSL_DPPIC_CHANNELS_USED_MASK
#elif defined(NRF54L_SERIES)
#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
#define NRFX_DPPI10_CHANNELS_USED_BY_MPSL MPSL_DPPIC10_CHANNELS_USED_MASK
#define NRFX_DPPI20_CHANNELS_USED_BY_MPSL MPSL_DPPIC20_CHANNELS_USED_MASK
#define NRFX_PPIB_11_21_CHANNELS_USED_BY_MPSL \
(MPSL_PPIB11_CHANNELS_USED_MASK | MPSL_PPIB21_CHANNELS_USED_MASK)
#elif defined(NRF54H_SERIES)
#elif defined(CONFIG_SOC_SERIES_NRF54HX)
#define NRFX_DPPI020_CHANNELS_USED_BY_MPSL MPSL_DPPIC020_CHANNELS_USED_MASK
#else
#error Unsupported chip family
Loading