From 77cff4c4fbe399532ce1b674d6e80d50908d8d5b Mon Sep 17 00:00:00 2001 From: Alberto Escolar Piedras Date: Thu, 7 Nov 2024 12:51:13 +0100 Subject: [PATCH] [nrf fromtree] boards nrfbsim: Enable UART(E) peripherals for nrf5340bsim The HW models now support this peripheral for these targets. Let's enable them. Signed-off-by: Alberto Escolar Piedras (cherry picked from commit a7abf80064444d0ac729d66856832cab90505c7c) --- boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts | 9 +++++++++ boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.yaml | 1 - boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts | 10 ++++++++++ boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.yaml | 1 - 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts index f70d06aae75..0273ee4d776 100644 --- a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts +++ b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts @@ -8,6 +8,7 @@ #include #include +#include <../boards/nordic/nrf5340dk/nrf5340_cpuapp_common-pinctrl.dtsi> / { model = "Nordic NRF5340 BSIM NRF5340 Application"; @@ -119,6 +120,14 @@ status = "okay"; }; +&uart0 { + status = "okay"; + current-speed = <115200>; + pinctrl-0 = <&uart0_default>; + pinctrl-1 = <&uart0_sleep>; + pinctrl-names = "default", "sleep"; +}; + /* We re-use the IPC shared buffer definition from the real HW. But note the start address of the * buffer won't be used. */ diff --git a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.yaml b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.yaml index 8e0cdf59fb7..9d31586454a 100644 --- a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.yaml +++ b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.yaml @@ -10,7 +10,6 @@ toolchain: testing: ignore_tags: - modem - - uart - bsim_skip_CI supported: - gpio diff --git a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts index 0b9d3a79d1a..0f098a7dd29 100644 --- a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts +++ b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts @@ -8,6 +8,7 @@ #include #include +#include <../boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpunet-pinctrl.dtsi> / { model = "Nordic NRF5340 BSIM NRF5340 Network"; @@ -23,6 +24,7 @@ }; chosen { + zephyr,console = &uart0; zephyr,bt-hci-ipc = &ipc0; nordic,802154-spinel-ipc = &ipc0; zephyr,ieee802154 = &ieee802154; @@ -79,6 +81,14 @@ status = "okay"; }; +&uart0 { + status = "okay"; + current-speed = <115200>; + pinctrl-0 = <&uart0_default>; + pinctrl-1 = <&uart0_sleep>; + pinctrl-names = "default", "sleep"; +}; + /* We re-use the IPC shared buffer definition from the real HW. But note the start address of the * buffer won't be used. */ diff --git a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.yaml b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.yaml index c774a3a5782..a0d6d2caa44 100644 --- a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.yaml +++ b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.yaml @@ -10,7 +10,6 @@ toolchain: testing: ignore_tags: - modem - - uart - bsim_skip_CI supported: - gpio