Skip to content

manifest: update collab-nrfx-4.0 to have pwm_nrfx reworked #24817

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 2 commits into from
Oct 30, 2025
Merged

manifest: update collab-nrfx-4.0 to have pwm_nrfx reworked #24817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
299457c
tests: drivers: nrfx_integration_test: remove PWM configs
mib1-nordic Oct 1, 2025
4e16dc8
manifest: update Zephyr and nrfx revisions to have reworked pwm_nrfx
mib1-nordic Oct 1, 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
4 changes: 0 additions & 4 deletions tests/drivers/nrfx_integration_test/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ config NRFX_ALL_DRIVERS
|| $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF53_FLASH_CONTROLLER)) \
|| $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF91_FLASH_CONTROLLER))
select NRFX_POWER if HAS_HW_NRF_POWER
select NRFX_PWM0 if HAS_HW_NRF_PWM0
select NRFX_PWM1 if HAS_HW_NRF_PWM1
select NRFX_PWM2 if HAS_HW_NRF_PWM2
select NRFX_PWM3 if HAS_HW_NRF_PWM3
select NRFX_QSPI if HAS_HW_NRF_QSPI
select NRFX_RNG if HAS_HW_NRF_RNG
select NRFX_RTC0 if HAS_HW_NRF_RTC0
Expand Down
4 changes: 2 additions & 2 deletions west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: 7116888baca7d3bc030573f1c7426f8723ece94a
revision: 3d574442a2ff259a47e45c845b4f3c8712e16a67
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down Expand Up @@ -280,7 +280,7 @@ manifest:
path: nrfx
groups:
- nrfx
revision: 8385472ad26a53a666d682cf48374478e0f29e05
revision: 41ddb0a51c0bf6edbe4fedeab23436361ba09a1f

# West-related configuration for the nrf repository.
self:
Expand Down
Loading