Skip to content

manifest: update sdk-zephyr #19513

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

Closed
wants to merge 3 commits into from
Closed

manifest: update sdk-zephyr #19513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a02e383
manifest: update sdk-zephyr
nordic-segl Dec 13, 2024
80068b9
tests: drivers: lpuart: Enable test execution on nrf54l20pdk
nordic-segl Dec 13, 2024
3b14ceb
samples: peripheral: lpuart: Enable test execution on nrf54l20pdk
nordic-segl Dec 13, 2024
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
9 changes: 9 additions & 0 deletions samples/peripheral/lpuart/boards/nrf54l20pdk_nrf54l20_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#
# Copyright (c) 2024 Nordic Semiconductor
#
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#
CONFIG_UART_21_ASYNC=y
CONFIG_UART_21_INTERRUPT_DRIVEN=n
# Do not use interrupt driven API for console UART to not enable RX.
CONFIG_UART_20_INTERRUPT_DRIVEN=n
52 changes: 52 additions & 0 deletions samples/peripheral/lpuart/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */

&pinctrl {
uart21_default_alt: uart21_default_alt {
group1 {
psels = <NRF_PSEL(UART_RX, 1, 10)>,
<NRF_PSEL(UART_TX, 1, 11)>;
};
};

uart21_sleep_alt: uart21_sleep_alt {
group1 {
psels = <NRF_PSEL(UART_RX, 1, 10)>,
<NRF_PSEL(UART_TX, 1, 11)>;
low-power-enable;
};
};
};

&uart21 {
status = "okay";
pinctrl-0 = <&uart21_default_alt>;
pinctrl-1 = <&uart21_sleep_alt>;
pinctrl-names = "default", "sleep";
current-speed = <115200>;
lpuart: nrf-sw-lpuart {
compatible = "nordic,nrf-sw-lpuart";
status = "okay";
req-pin = <40>;
rdy-pin = <41>;
};
};

&gpiote20 {
status = "okay";
};

&uart20_default {
/* Disconnect CTS and RTS lines from pins.
* This is a workaround for increased current consumption
* (~250 uA more).
*/
group1 {
psels = <NRF_PSEL(UART_TX, 1, 4)>,
<NRF_PSEL_DISCONNECTED(UART_RTS)>;
};
group2 {
psels = <NRF_PSEL(UART_RX, 1, 5)>,
<NRF_PSEL_DISCONNECTED(UART_CTS)>;
bias-pull-up;
};
};
9 changes: 7 additions & 2 deletions samples/peripheral/lpuart/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ tests:
- nrf54l15dk/nrf54l05/cpuapp
- nrf54l15dk/nrf54l10/cpuapp
- nrf54l15dk/nrf54l15/cpuapp
- nrf54l20pdk/nrf54l20/cpuapp
integration_platforms:
- nrf52dk/nrf52832
- nrf52833dk/nrf52833
Expand All @@ -28,6 +29,7 @@ tests:
- nrf54l15dk/nrf54l05/cpuapp
- nrf54l15dk/nrf54l10/cpuapp
- nrf54l15dk/nrf54l15/cpuapp
- nrf54l20pdk/nrf54l20/cpuapp
platform_exclude: native_sim
tags: ppk_power_measure
harness: pytest
Expand All @@ -47,6 +49,7 @@ tests:
- nrf54l15dk/nrf54l05/cpuapp
- nrf54l15dk/nrf54l10/cpuapp
- nrf54l15dk/nrf54l15/cpuapp
- nrf54l20pdk/nrf54l20/cpuapp
integration_platforms:
- nrf52840dk/nrf52840
extra_configs:
Expand Down Expand Up @@ -83,9 +86,10 @@ tests:
- nrf54l15dk/nrf54l05/cpuapp
- nrf54l15dk/nrf54l10/cpuapp
- nrf54l15dk/nrf54l15/cpuapp
- nrf54l20pdk/nrf54l20/cpuapp
platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 nrf9160dk/nrf9160/ns
nrf5340dk/nrf5340/cpuapp nrf21540dk/nrf52840 nrf54l15dk/nrf54l05/cpuapp
nrf54l15dk/nrf54l10/cpuapp nrf54l15dk/nrf54l15/cpuapp
nrf54l15dk/nrf54l10/cpuapp nrf54l15dk/nrf54l15/cpuapp nrf54l20pdk/nrf54l20/cpuapp
tags: ppk_power_measure
harness: pytest
harness_config:
Expand All @@ -112,9 +116,10 @@ tests:
- nrf54l15dk/nrf54l05/cpuapp
- nrf54l15dk/nrf54l10/cpuapp
- nrf54l15dk/nrf54l15/cpuapp
- nrf54l20pdk/nrf54l20/cpuapp
platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 nrf9160dk/nrf9160/ns
nrf5340dk/nrf5340/cpuapp nrf21540dk/nrf52840 nrf54l15dk/nrf54l05/cpuapp
nrf54l15dk/nrf54l10/cpuapp nrf54l15dk/nrf54l15/cpuapp
nrf54l15dk/nrf54l10/cpuapp nrf54l15dk/nrf54l15/cpuapp nrf54l20pdk/nrf54l20/cpuapp
harness: console
harness_config:
fixture: gpio_loopback
Expand Down
9 changes: 9 additions & 0 deletions tests/drivers/lpuart/boards/nrf54l20pdk_nrf54l20_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#
# Copyright (c) 2024 Nordic Semiconductor
#
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#
CONFIG_UART_21_ASYNC=y
CONFIG_UART_21_INTERRUPT_DRIVEN=n
# Do not use interrupt driven API for console UART to not enable RX.
CONFIG_UART_20_INTERRUPT_DRIVEN=n
49 changes: 49 additions & 0 deletions tests/drivers/lpuart/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */

&pinctrl {
uart21_default_alt: uart21_default_alt {
group1 {
psels = <NRF_PSEL(UART_RX, 1, 10)>,
<NRF_PSEL(UART_TX, 1, 11)>;
};
};

uart21_sleep_alt: uart21_sleep_alt {
group1 {
psels = <NRF_PSEL(UART_RX, 1, 10)>,
<NRF_PSEL(UART_TX, 1, 11)>;
low-power-enable;
};
};
};

&uart21 {
status = "okay";
pinctrl-0 = <&uart21_default_alt>;
pinctrl-1 = <&uart21_sleep_alt>;
pinctrl-names = "default", "sleep";
current-speed = <115200>;
lpuart: nrf-sw-lpuart {
compatible = "nordic,nrf-sw-lpuart";
status = "okay";
req-pin = <40>;
rdy-pin = <41>;
};
};

&gpiote20 {
status = "okay";
};

&timer20 {
status = "okay";
interrupts = <202 0>;
};

/ {
busy-sim {
compatible = "vnd,busy-sim";
status = "okay";
counter = <&timer20>;
};
};
4 changes: 4 additions & 0 deletions tests/drivers/lpuart/testcase.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@ tests:
- nrf54l15dk/nrf54l05/cpuapp
- nrf54l15dk/nrf54l10/cpuapp
- nrf54l15dk/nrf54l15/cpuapp
- nrf54l20pdk/nrf54l20/cpuapp
integration_platforms:
- nrf54l15dk/nrf54l05/cpuapp
- nrf54l15dk/nrf54l10/cpuapp
- nrf54l15dk/nrf54l15/cpuapp
- nrf54l20pdk/nrf54l20/cpuapp
extra_configs:
- CONFIG_TEST_LPUART_LOOPBACK=y
harness: ztest
Expand All @@ -35,10 +37,12 @@ tests:
- nrf54l15dk/nrf54l05/cpuapp
- nrf54l15dk/nrf54l10/cpuapp
- nrf54l15dk/nrf54l15/cpuapp
- nrf54l20pdk/nrf54l20/cpuapp
integration_platforms:
- nrf54l15dk/nrf54l05/cpuapp
- nrf54l15dk/nrf54l10/cpuapp
- nrf54l15dk/nrf54l15/cpuapp
- nrf54l20pdk/nrf54l20/cpuapp
extra_configs:
- CONFIG_TEST_LPUART_LOOPBACK=y
- CONFIG_TEST_BUSY_SIM=y
Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: 36a1e64bc8414029324cb4e8a4828c13c170f3fc
revision: pull/2373/head
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down
Loading