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

Conversation

nika-nordic
Copy link
Contributor

@nika-nordic nika-nordic commented Feb 3, 2025

PR cherry-picks nrfx 3.10.0 hal_nordic update, alongside all dependent changes

@NordicBuilder
Copy link
Contributor

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
hal_nordic zephyrproject-rtos/hal_nordic@fae1542 zephyrproject-rtos/hal_nordic@a1db06a (master) zephyrproject-rtos/hal_nordic@fae15426..a1db06a2

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@anangl
Copy link
Contributor

anangl commented Feb 4, 2025

The last commit ("drivers: hwinfo: Support for reset reasons in nRF54H20") is missing the [nrf fromtree] tag.

@nika-nordic nika-nordic force-pushed the integrate_nrfx_3_10_sdkzephyr branch 2 times, most recently from c18aeef to 649bde0 Compare February 7, 2025 09:24
@nika-nordic
Copy link
Contributor Author

The last commit ("drivers: hwinfo: Support for reset reasons in nRF54H20") is missing the [nrf fromtree] tag.

fixed

@nika-nordic nika-nordic force-pushed the integrate_nrfx_3_10_sdkzephyr branch from 649bde0 to 58159f3 Compare February 7, 2025 09:52
@nika-nordic nika-nordic force-pushed the integrate_nrfx_3_10_sdkzephyr branch from 58159f3 to fcfe29b Compare February 11, 2025 12:06
e-rk and others added 15 commits February 12, 2025 13:26
The DPPI and PPIB peripheral nodes must be enabled to allow the
CONFIG_HAS_HW_NRF_DPPIC to be set. This change is consistent with what
was done on nRF5340 and does not introduce any additional memory
overhead, because there is no Zephyr driver behind the nrf-dppic and
nrf-ppib bindings.

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
(cherry picked from commit d890cfd)
… check

The UART_xyz_ENHANCED_POLL_OUT Kconfig was using an outdated property
for checking whether the peripheral has the endtx->stoptx short. The
property is now updated.

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
(cherry picked from commit ec1f662)
This commit updates revision of hal_nordic to bring the latest changes
in the nRF IEEE 802.15.4 driver.

Signed-off-by: Andrzej Kuroś <andrzej.kuros@nordicsemi.no>
(cherry picked from commit 9a0ff57)
…RAW_API

The non-raw API has been removed from the nRF 802.15.4 Radio Driver.
There is no need to set NRF_802154_USE_RAW_API macro anymore in
CMakeLists.txt that integrates the driver.

Signed-off-by: Andrzej Kuroś <andrzej.kuros@nordicsemi.no>
(cherry picked from commit ad1657f)
Update hal_nordic so that nrfx twister files use native YAML
lists.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
(cherry picked from commit ceaf33c)
…g driver

Update with the latest nordic hal

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 2a95e22)
… 3.10.0

New nrfx version contains support for nRF7120 Eng A device.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit 3fe559a)
…nction

Avoid unhandled event calling assert function

Signed-off-by: Matthias Hauser <matthias.hauser@we-online.de>
(cherry picked from commit 5438643)
…nts for now

New events from nrfx_clock driver are not utilized for now
by the clock_control, so should be ignored to avoid assertion.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
(cherry picked from commit 2692f16)
…nRF54H20"

This reverts commit 622410f.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Adding support for reset reasons in the nRF54H20 SoC.

Signed-off-by: Karol Lasończyk <karol.lasonczyk@nordicsemi.no>
(cherry picked from commit f551b2d)
…tforms

Changed the CMakeLists to enable the nrfx_gppi utilities based solely on
the CONFIG_NRFX_GPPI Kconfig. This unifies the configuration on all nRF
SoC families.

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
(cherry picked from commit d2cb0bd)
…symbol mapping

Add missing symbol mapping necessary to enable logging for GPIOTE
nrfx driver.

Signed-off-by: Adam Wojasinski <awojasinski@baylibre.com>
(cherry picked from commit cd64d03)
…or 54lbsim

We should use CONFIG_SOC_COMPATIBLE_NRF54L15 whenever possible.
With the current bsim model of 54L these files do not yet compile,
but that can be added separately.

Compilation warning:
```
/nrfx_interconnect_dppic_ppib.c:158:36:
warning: implicit declaration of function ‘nrf_address_bus_get’
[-Wimplicit-function-declaration]
  158 |         uint8_t bus_address_area =
	nrf_address_bus_get(addr, p_dppic->apb_size);
      |                                    ^~~~~~~~~~~~~~~~~~~
```

Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
(cherry picked from commit 81ed343)
Add nrf54l09 EngA SoC in soc, dts and hal_nordic.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit b0afa1e)
nordic-krch and others added 6 commits February 12, 2025 13:28
…EXTENDED_ENABLED

nrfx_config is setting NRFX_SPIM_EXTENDED_ENABLED based on presence of
a DT property. However, there are test cases when it is expected that
extended SPIM features will be disabled on a target that supports
extended features. Allow that by not setting the value if it is already
defined.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit eebaf81)
This reverts commit 3467a9b.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
There is no reason to duplicate `nrfx_config_*.h` files.
Use configuration files from `hal_nordic/nrfx/templates`.

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
(cherry picked from commit aa3f787)
* Move all KConfig configuration from CMake to `nrfx_kconfig.h`
* Move macro utils from `nrfx_kconfig.h` to `nrfx_zephyr_utils.h`
* Move GRTC channels allocation from `nrfx_kconfig.h` to
  `nrfx_reserved_resources.h`

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
(cherry picked from commit 94589b7)
Added ncs-specific modules to nrfx_config_reserved_resources.
The modules are:
- mpsl
- nrfe

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
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>
@nika-nordic
Copy link
Contributor Author

closing in favor of #2492

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.