Skip to content

[nrf fromtree] Integrate nrfx 3.10.0 - postupmerge #2492

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 14 commits into from
Feb 21, 2025
Merged

[nrf fromtree] Integrate nrfx 3.10.0 - postupmerge #2492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3f79712
[nrf fromtree] manifest: Update hal_nordic with new cracen hal and rn…
aescolar Jan 14, 2025
c74d151
[nrf fromtree] manifest: update hal_nordic revision to integrate nrfx…
nika-nordic Jan 21, 2025
f63e69c
[nrf fromtree] drivers: nrfx: Avoid unhandled event calling assert fu…
mah-eiSmart Jan 17, 2025
e3500d8
[nrf fromtree] drivers: clock_control: nrf: ignore XOTUNE-related eve…
nika-nordic Jan 22, 2025
cd2fb2c
Revert "[nrf noup] drivers: hwinfo: Support for reset reasons in nRF5…
nika-nordic Feb 13, 2025
6b2958e
[nrf fromtree] drivers: hwinfo: Support for reset reasons in nRF54H20
kl-cruz Nov 22, 2024
ac679f6
[nrf fromtree] modules: hal_nordic: nrfx_config: Customize NRFX_SPIM_…
nordic-krch Dec 4, 2024
657a3ff
Revert "[nrf noup] modules: hal_nordic: adjust nrfx reservations to NCS"
nika-nordic Feb 11, 2025
525d4d3
[nrf fromtree] modules: hal_nordic: nrfx: use templates from hal_nordic
masz-nordic Nov 20, 2024
8187e45
[nrf fromtree] modules: hal_nordic: nrfx: cleanup
masz-nordic Nov 20, 2024
a1a9b9a
[nrf noup] modules: hal_nordic: adjust nrfx reservations to NCS
e-rk Oct 22, 2024
5527f26
[nrf noup] modules: hal_nordic: use Kconfig symbols in NCS reservation
nika-nordic Feb 12, 2025
bbcb577
[nrf fromtree] modules: hal_nordic: nrfx: Move some defines back to C…
nordic-krch Jan 16, 2025
8057f8c
[nrf fromtree] tests: drivers: pwm: Update gpio config
Jan 8, 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
10 changes: 10 additions & 0 deletions drivers/clock_control/clock_control_nrf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,6 +637,16 @@ static void clock_event_handler(nrfx_clock_evt_type_t event)
__ASSERT_NO_MSG(false);
}
break;
case NRFX_CLOCK_EVT_PLL_STARTED:
#if NRF_CLOCK_HAS_XO_TUNE
case NRFX_CLOCK_EVT_XO_TUNED:
case NRFX_CLOCK_EVT_XO_TUNE_ERROR:
case NRFX_CLOCK_EVT_XO_TUNE_FAILED:
#endif
{
/* unhandled event */
break;
}
default:
__ASSERT_NO_MSG(0);
break;
Expand Down
7 changes: 4 additions & 3 deletions drivers/hwinfo/hwinfo_nrf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ ssize_t z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length)

#if defined(NRF_RESETINFO)

#define REASON_LOCKUP (NRFX_RESET_REASON_LOCKUP | NRFX_RESET_REASON_LOCAL_LOCKUP_MASK)
#define REASON_SOFTWARE (NRFX_RESET_REASON_SREQ | NRFX_RESET_REASON_LOCAL_SREQ_MASK)
#define REASON_LOCKUP (NRFX_RESET_REASON_LOCKUP_MASK | NRFX_RESET_REASON_LOCAL_LOCKUP_MASK)
#define REASON_SOFTWARE (NRFX_RESET_REASON_SREQ_MASK | NRFX_RESET_REASON_LOCAL_SREQ_MASK)
#define REASON_WATCHDOG \
(NRFX_RESET_REASON_DOG_MASK | \
NRFX_RESET_REASON_LOCAL_DOG1_MASK | \
Expand All @@ -87,7 +87,7 @@ ssize_t z_impl_hwinfo_get_device_id(uint8_t *buffer, size_t length)
#if NRF_POWER_HAS_RESETREAS
#define REASON_WATCHDOG NRFX_RESET_REASON_DOG_MASK
#else
#define REASON_WATCHDOG NRFX_RESET_REASON_DOG1_MASK
#define REASON_WATCHDOG (NRFX_RESET_REASON_DOG0_MASK | NRFX_RESET_REASON_DOG1_MASK)
#endif /* NRF_POWER_HAS_RESETREAS */

#endif /* NRF_RESETINFO */
Expand Down Expand Up @@ -173,6 +173,7 @@ int z_impl_hwinfo_get_reset_cause(uint32_t *cause)
if (reason & NRFX_RESET_REASON_LCTRLAP_MASK) {
flags |= RESET_DEBUG;
}

#endif
#if defined(NRFX_RESET_REASON_TAMPC_MASK)
if (reason & NRFX_RESET_REASON_TAMPC_MASK) {
Expand Down
2 changes: 1 addition & 1 deletion modules/hal_nordic/nrfx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LX_SKIP_GLITCHDETECTOR_DISABLE
# Inject code to skip TAMPC setup for nRF54L20 and nRF54L09. It is not supported for now.
# It needs to be removed when support is provided.
if(CONFIG_SOC_NRF54L20_ENGA_CPUAPP OR CONFIG_SOC_NRF54L09_ENGA_CPUAPP)
zephyr_compile_definitions(NRF_SKIP_TAMPC_SETUP)
zephyr_compile_definitions(NRF_SKIP_TAMPC_SETUP)
endif()

if(CONFIG_SOC_COMPATIBLE_NRF54LX AND CONFIG_NRFX_GPPI)
Expand Down
Loading