diff --git a/samples/peripheral/lpuart/boards/nrf54l20pdk_nrf54l20_cpuapp.conf b/samples/peripheral/lpuart/boards/nrf54l20pdk_nrf54l20_cpuapp.conf new file mode 100644 index 000000000000..0c494e5bcffb --- /dev/null +++ b/samples/peripheral/lpuart/boards/nrf54l20pdk_nrf54l20_cpuapp.conf @@ -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 diff --git a/samples/peripheral/lpuart/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/samples/peripheral/lpuart/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay new file mode 100644 index 000000000000..6b6d835c13a3 --- /dev/null +++ b/samples/peripheral/lpuart/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay @@ -0,0 +1,52 @@ +/* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ + +&pinctrl { + uart21_default_alt: uart21_default_alt { + group1 { + psels = , + ; + }; + }; + + uart21_sleep_alt: uart21_sleep_alt { + group1 { + psels = , + ; + 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 = , + ; + }; + group2 { + psels = , + ; + bias-pull-up; + }; +}; diff --git a/samples/peripheral/lpuart/sample.yaml b/samples/peripheral/lpuart/sample.yaml index 641f90bb3f74..43c3ee3080f4 100644 --- a/samples/peripheral/lpuart/sample.yaml +++ b/samples/peripheral/lpuart/sample.yaml @@ -18,6 +18,7 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54l15dk/nrf54l10/cpuapp - nrf54l15dk/nrf54l15/cpuapp + - nrf54l20pdk/nrf54l20/cpuapp integration_platforms: - nrf52dk/nrf52832 - nrf52833dk/nrf52833 @@ -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 @@ -47,6 +49,7 @@ tests: - nrf54l15dk/nrf54l05/cpuapp - nrf54l15dk/nrf54l10/cpuapp - nrf54l15dk/nrf54l15/cpuapp + - nrf54l20pdk/nrf54l20/cpuapp integration_platforms: - nrf52840dk/nrf52840 extra_configs: @@ -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: @@ -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 diff --git a/tests/drivers/lpuart/boards/nrf54l20pdk_nrf54l20_cpuapp.conf b/tests/drivers/lpuart/boards/nrf54l20pdk_nrf54l20_cpuapp.conf new file mode 100644 index 000000000000..0c494e5bcffb --- /dev/null +++ b/tests/drivers/lpuart/boards/nrf54l20pdk_nrf54l20_cpuapp.conf @@ -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 diff --git a/tests/drivers/lpuart/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay b/tests/drivers/lpuart/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay new file mode 100644 index 000000000000..7a903a8c0204 --- /dev/null +++ b/tests/drivers/lpuart/boards/nrf54l20pdk_nrf54l20_cpuapp.overlay @@ -0,0 +1,49 @@ +/* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ + +&pinctrl { + uart21_default_alt: uart21_default_alt { + group1 { + psels = , + ; + }; + }; + + uart21_sleep_alt: uart21_sleep_alt { + group1 { + psels = , + ; + 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>; + }; +}; diff --git a/tests/drivers/lpuart/testcase.yaml b/tests/drivers/lpuart/testcase.yaml index 7c9d24257024..dfccf1966e43 100644 --- a/tests/drivers/lpuart/testcase.yaml +++ b/tests/drivers/lpuart/testcase.yaml @@ -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 @@ -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 diff --git a/west.yml b/west.yml index 01cadbf023bf..84a36bf24441 100644 --- a/west.yml +++ b/west.yml @@ -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