diff --git a/dts/common/nordic/nrf54lm20a.dtsi b/dts/common/nordic/nrf54lm20a.dtsi index b4be816fb179..922953d239fb 100644 --- a/dts/common/nordic/nrf54lm20a.dtsi +++ b/dts/common/nordic/nrf54lm20a.dtsi @@ -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 = ; + startup-time-us = <1650>; }; hfpll: hfpll { diff --git a/dts/common/nordic/nrf54lv10a.dtsi b/dts/common/nordic/nrf54lv10a.dtsi index 02be1f907a3e..5d33debfe04f 100644 --- a/dts/common/nordic/nrf54lv10a.dtsi +++ b/dts/common/nordic/nrf54lv10a.dtsi @@ -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 = ; + startup-time-us = <1650>; }; hfpll: hfpll { diff --git a/dts/common/nordic/nrf7120_enga.dtsi b/dts/common/nordic/nrf7120_enga.dtsi index a53616eca474..7d9a0e1b585a 100644 --- a/dts/common/nordic/nrf7120_enga.dtsi +++ b/dts/common/nordic/nrf7120_enga.dtsi @@ -55,7 +55,7 @@ clock-frequency = <32768>; }; - hfxo: hfxo64m { + hfxo64m: hfxo64m { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = ; diff --git a/subsys/mpsl/init/Kconfig b/subsys/mpsl/init/Kconfig index e3fb208d4e13..554d148305ea 100644 --- a/subsys/mpsl/init/Kconfig +++ b/subsys/mpsl/init/Kconfig @@ -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) default 1400 help This option configures the amount of time MPSL will assume it takes diff --git a/west.yml b/west.yml index 35c47b9d9060..04955065099e 100644 --- a/west.yml +++ b/west.yml @@ -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 @@ -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 @@ -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