From 97f5d5257e68bd9089beaea094f2864df5150b46 Mon Sep 17 00:00:00 2001 From: Alberto Escolar Piedras Date: Thu, 13 Feb 2025 12:37:58 +0100 Subject: [PATCH 1/4] [nrf fromtree] tests/bsim UART: Let's connect the nrf54L UART00 in loopback too A test is going to use this UART also, so we'll need it. Signed-off-by: Alberto Escolar Piedras (cherry picked from commit dc87bb0f6812a42beb2814f80fd5bf4c1000e100) --- tests/bsim/ci.uart.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bsim/ci.uart.sh b/tests/bsim/ci.uart.sh index 70d296d23df..7f53fa86406 100755 --- a/tests/bsim/ci.uart.sh +++ b/tests/bsim/ci.uart.sh @@ -20,7 +20,7 @@ ${ZEPHYR_BASE}/scripts/twister -T tests/drivers/uart/ --force-color --inline-log echo " nRF54L15:" ${ZEPHYR_BASE}/scripts/twister -T tests/drivers/uart/ --force-color --inline-logs -v -M \ -p nrf54l15bsim/nrf54l15/cpuapp --fixture gpio_loopback \ - -- -uart2_loopback + -- -uart0_loopback -uart2_loopback echo "UART: Multi device tests" WORK_DIR=${ZEPHYR_BASE}/bsim_uart nice tests/bsim/drivers/uart/compile.sh From 4c5bfd7dc3026797eb3ec1febaf2cf720329c45b Mon Sep 17 00:00:00 2001 From: Piotr Krzyzanowski Date: Tue, 11 Feb 2025 17:08:33 +0100 Subject: [PATCH 2/4] [nrf fromtree] tests: drivers: uart: add 54l15 fast uart Add the fast uart instance of 54l15 for testing Signed-off-by: Piotr Krzyzanowski (cherry picked from commit 6d8eb184b76fc35f95887c0440674f3b362de1c7) --- .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index ed4a2de1891..a1e29cbf0ff 100644 --- a/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/tests/drivers/uart/uart_async_api/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -1,5 +1,9 @@ /* SPDX-License-Identifier: Apache-2.0 */ +&spi00 { + status = "disabled"; +}; + &pinctrl { uart21_default_alt: uart21_default_alt { group1 { @@ -15,6 +19,21 @@ low-power-enable; }; }; + + uart00_default_alt: uart00_default_alt { + group1 { + psels = , + ; + }; + }; + + uart00_sleep_alt: uart00_sleep_alt { + group1 { + psels = , + ; + low-power-enable; + }; + }; }; dut: &uart21 { @@ -24,3 +43,11 @@ dut: &uart21 { pinctrl-names = "default", "sleep"; current-speed = <115200>; }; + +dut2: &uart00 { + status = "okay"; + pinctrl-0 = <&uart00_default_alt>; + pinctrl-1 = <&uart00_sleep_alt>; + pinctrl-names = "default", "sleep"; + current-speed = <4000000>; +}; From acfa3ff6fbd7f98a53103cdb00d168d9d1e691e2 Mon Sep 17 00:00:00 2001 From: Alberto Escolar Piedras Date: Thu, 13 Feb 2025 12:23:38 +0100 Subject: [PATCH 3/4] [nrf fromtree] boards nrf54l15bsim: Do not work around peripheral clock issue In 923d313a04726f6475b19ef803eb8b5a080e91d7 the clock frequency in DTS for the UART00 was fixed, but not for the simulated target. This was likely due to the HW models modeling it as 16MHz instead of 128MHz for this particular one as it is in reality. Now that the HW models have been fixed, let's let this clock be configured like for real HW. Signed-off-by: Alberto Escolar Piedras (cherry picked from commit 5e7df92082ccb084ba13c2abf98f8512a00ad192) --- boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts index 13bf2e338f8..1a38b094795 100644 --- a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts +++ b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts @@ -84,10 +84,6 @@ }; }; -&uart00 { - /delete-property/ clocks; -}; - &uart20 { status = "okay"; current-speed = <115200>; From 377c45ab6a585dbbb27c9e55c33b75ab0ae79024 Mon Sep 17 00:00:00 2001 From: Piotr Krzyzanowski Date: Thu, 13 Feb 2025 19:35:42 +0100 Subject: [PATCH 4/4] [nrf fromtree] boards: nrf_bsim: disable insted of deletion spi node Disable insted of deletion of spi00 node on 54l15bsim Signed-off-by: Piotr Krzyzanowski (cherry picked from commit ae80fb10d4df487ce8323735bda4ffc0d92ad4a5) --- boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts index 1a38b094795..9a2d3e25c97 100644 --- a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts +++ b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts @@ -28,7 +28,6 @@ /delete-node/ memory@20000000; /delete-node/ memory@2002f000; peripheral@50000000 { - /delete-node/ spi@4a000; /delete-node/ vpr@4c000; /delete-node/ mailbox@0; /delete-node/ interrupt-controller@f0000000; @@ -84,6 +83,10 @@ }; }; +&spi00 { + status = "disabled"; +}; + &uart20 { status = "okay"; current-speed = <115200>;