Skip to content

manifest: Update sdk-zephyr revision #22732

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
Jun 12, 2025
Merged

manifest: Update sdk-zephyr revision #22732

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
8d0c327
manifest: Update sdk-zephyr and nrf-802154 revision
e-rk Jun 12, 2025
80d256c
dts: common: nordic: nrf7120: rename hfxo to hfxo64m
e-rk Jun 11, 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
5 changes: 3 additions & 2 deletions dts/common/nordic/nrf54lm20a.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,16 @@
};

lfxo: lfxo {
compatible = "nordic,nrf-lfxo";
compatible = "nordic,nrf54l-lfxo";
#clock-cells = <0>;
clock-frequency = <32768>;
};

hfxo: hfxo {
compatible = "nordic,nrf-hfxo";
compatible = "nordic,nrf54l-hfxo";
#clock-cells = <0>;
clock-frequency = <DT_FREQ_M(32)>;
startup-time-us = <1650>;
};

hfpll: hfpll {
Expand Down
5 changes: 3 additions & 2 deletions dts/common/nordic/nrf54lv10a.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,16 @@
};

lfxo: lfxo {
compatible = "nordic,nrf-lfxo";
compatible = "nordic,nrf54l-lfxo";
#clock-cells = <0>;
clock-frequency = <32768>;
};

hfxo: hfxo {
compatible = "nordic,nrf-hfxo";
compatible = "nordic,nrf54l-hfxo";
#clock-cells = <0>;
clock-frequency = <DT_FREQ_M(32)>;
startup-time-us = <1650>;
};

hfpll: hfpll {
Expand Down
2 changes: 1 addition & 1 deletion dts/common/nordic/nrf7120_enga.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
clock-frequency = <32768>;
};

hfxo: hfxo64m {
hfxo64m: hfxo64m {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <DT_FREQ_M(64)>;
Expand Down
3 changes: 2 additions & 1 deletion subsys/mpsl/init/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ config MPSL_LOW_PRIO_IRQN

config MPSL_HFCLK_LATENCY
int "HFCLK ramp-up latency in microsecond, assumed by MPSL to wait for the clock availability"
default 1650 if SOC_SERIES_NRF54LX
default $(dt_node_int_prop_int,/clocks/hfxo,startup-time-us) if $(dt_node_has_prop,/clocks/hfxo,startup-time-us)
default $(dt_node_int_prop_int,/oscillators/hfxo,startup-time-us) if $(dt_node_has_prop,/oscillators/hfxo,startup-time-us)
Copy link
Contributor

Choose a reason for hiding this comment

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

Why not use the hfxo node label, actually? I mean:

default $(dt_nodelabel_int_prop,hfxo,startup-time-us) if $(dt_nodelabel_has_prop,hfxo,startup-time-us)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I didn't know that this existed. Could it be done in subsequent PR to unblock manifest updates for others?

default 1400
help
This option configures the amount of time MPSL will assume it takes
Expand Down
6 changes: 3 additions & 3 deletions west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: bcf554e67c331a512c67f91b57dc6d797899e356
revision: 68ab1cf88c635a957aad4af56024469b13eb3b3d
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down Expand Up @@ -145,7 +145,7 @@ manifest:
- name: nrfxlib
repo-path: sdk-nrfxlib
path: nrfxlib
revision: b6675b02789cf0c34d7bb9dd9c0694e6dc05bf77
revision: 8f13312e5acea1ebc03cd368a1cd3f18026329f8
- name: trusted-firmware-m
repo-path: sdk-trusted-firmware-m
path: modules/tee/tf-m/trusted-firmware-m
Expand Down Expand Up @@ -176,7 +176,7 @@ manifest:
- name: nrf-802154
repo-path: sdk-nrf-802154
path: nrf-802154
revision: 537640fbdd2fc023cc7910d3e59b7bd063c2e65b
revision: ab926396fe37113664734181cc4dfbb53fb61863
groups:
- nrf-802154
- name: dragoon
Expand Down
Loading