Skip to content

Commit 26e4dea

Browse files
e-rkrlubos
authored andcommitted
manifest: Update sdk-zephyr and nrf-802154 revision
The clock latency configuration for both nrf-802154 and MPSL is now done in DTS. Signed-off-by: Rafał Kuźnia <[email protected]>
1 parent fba4e9b commit 26e4dea

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

dts/common/nordic/nrf54lm20a.dtsi

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,16 @@
6161
};
6262

6363
lfxo: lfxo {
64-
compatible = "nordic,nrf-lfxo";
64+
compatible = "nordic,nrf54l-lfxo";
6565
#clock-cells = <0>;
6666
clock-frequency = <32768>;
6767
};
6868

6969
hfxo: hfxo {
70-
compatible = "nordic,nrf-hfxo";
70+
compatible = "nordic,nrf54l-hfxo";
7171
#clock-cells = <0>;
7272
clock-frequency = <DT_FREQ_M(32)>;
73+
startup-time-us = <1650>;
7374
};
7475

7576
hfpll: hfpll {

dts/common/nordic/nrf54lv10a.dtsi

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,16 @@
5656
};
5757

5858
lfxo: lfxo {
59-
compatible = "nordic,nrf-lfxo";
59+
compatible = "nordic,nrf54l-lfxo";
6060
#clock-cells = <0>;
6161
clock-frequency = <32768>;
6262
};
6363

6464
hfxo: hfxo {
65-
compatible = "nordic,nrf-hfxo";
65+
compatible = "nordic,nrf54l-hfxo";
6666
#clock-cells = <0>;
6767
clock-frequency = <DT_FREQ_M(32)>;
68+
startup-time-us = <1650>;
6869
};
6970

7071
hfpll: hfpll {

subsys/mpsl/init/Kconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ config MPSL_LOW_PRIO_IRQN
7878

7979
config MPSL_HFCLK_LATENCY
8080
int "HFCLK ramp-up latency in microsecond, assumed by MPSL to wait for the clock availability"
81-
default 1650 if SOC_SERIES_NRF54LX
81+
default $(dt_node_int_prop_int,/clocks/hfxo,startup-time-us) if $(dt_node_has_prop,/clocks/hfxo,startup-time-us)
82+
default $(dt_node_int_prop_int,/oscillators/hfxo,startup-time-us) if $(dt_node_has_prop,/oscillators/hfxo,startup-time-us)
8283
default 1400
8384
help
8485
This option configures the amount of time MPSL will assume it takes

west.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ manifest:
6565
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
6666
- name: zephyr
6767
repo-path: sdk-zephyr
68-
revision: bcf554e67c331a512c67f91b57dc6d797899e356
68+
revision: 68ab1cf88c635a957aad4af56024469b13eb3b3d
6969
import:
7070
# In addition to the zephyr repository itself, NCS also
7171
# imports the contents of zephyr/west.yml at the above
@@ -145,7 +145,7 @@ manifest:
145145
- name: nrfxlib
146146
repo-path: sdk-nrfxlib
147147
path: nrfxlib
148-
revision: b6675b02789cf0c34d7bb9dd9c0694e6dc05bf77
148+
revision: 8f13312e5acea1ebc03cd368a1cd3f18026329f8
149149
- name: trusted-firmware-m
150150
repo-path: sdk-trusted-firmware-m
151151
path: modules/tee/tf-m/trusted-firmware-m
@@ -176,7 +176,7 @@ manifest:
176176
- name: nrf-802154
177177
repo-path: sdk-nrf-802154
178178
path: nrf-802154
179-
revision: 537640fbdd2fc023cc7910d3e59b7bd063c2e65b
179+
revision: ab926396fe37113664734181cc4dfbb53fb61863
180180
groups:
181181
- nrf-802154
182182
- name: dragoon

0 commit comments

Comments
 (0)