diff --git a/dts/common/nordic/nrf54lm20a.dtsi b/dts/common/nordic/nrf54lm20a.dtsi index 5ff63dedd094..388ae31c3ad0 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/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 1f2d32e6aa7f..1ec36719f773 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: e6537849e886ca40b68269e0c5d39be66f09479d + revision: pull/2927/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above