diff --git a/boards/native/nrf_bsim/doc/nrf5340bsim.rst b/boards/native/nrf_bsim/doc/nrf5340bsim.rst index 271e0db1bc1..d726c9d8e7b 100644 --- a/boards/native/nrf_bsim/doc/nrf5340bsim.rst +++ b/boards/native/nrf_bsim/doc/nrf5340bsim.rst @@ -34,6 +34,7 @@ These boards include models of some of the nRF5340 SOC peripherals: * DPPI (Distributed Programmable Peripheral Interconnect) * EGU (Event Generator Unit) * FICR (Factory Information Configuration Registers) +* GPIO & GPIOTE * IPC (Interprocessor communication) * MUTEX (Mutual exclusive peripheral) * NVMC (Non-Volatile Memory Controller / Flash) @@ -42,6 +43,7 @@ These boards include models of some of the nRF5340 SOC peripherals: * RTC (Real Time Counter) * TEMP (Temperature sensor) * TIMER +* UARTE (UART with Easy DMA) * UICR (User Information Configuration Registers) and will use the same drivers as the nrf5340dk targets for these. diff --git a/boards/native/nrf_bsim/doc/nrf54l15bsim.rst b/boards/native/nrf_bsim/doc/nrf54l15bsim.rst index 61ad06c4aa5..5d7d67f7d1a 100644 --- a/boards/native/nrf_bsim/doc/nrf54l15bsim.rst +++ b/boards/native/nrf_bsim/doc/nrf54l15bsim.rst @@ -42,6 +42,7 @@ This boards include models of some of the nRF54L15 SOC peripherals: * ECB (AES electronic codebook mode encryption) * EGU (Event Generator Unit) * FICR (Factory Information Configuration Registers) +* GPIO & GPIOTE * GRTC (Global Real-time Counter) * PPIB (PPI Bridge) * RADIO @@ -49,6 +50,7 @@ This boards include models of some of the nRF54L15 SOC peripherals: * RTC (Real Time Counter) * TEMP (Temperature sensor) * TIMER +* UARTE (UART with Easy DMA) * UICR (User Information Configuration Registers) and will use the same drivers as the nrf54l15dk targets for these. diff --git a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts index 256b9bfb875..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"; @@ -35,9 +36,6 @@ /delete-property/ i2s-0; /delete-property/ qdec-0; /delete-property/ qdec-1; - /delete-property/ gpio-0; - /delete-property/ gpio-1; - /delete-property/ gpiote-0; }; chosen { @@ -82,11 +80,8 @@ /delete-node/ regulator@37000; /delete-node/ kmu@39000; /delete-node/ vmc@81000; - /delete-node/ gpio@842500; - /delete-node/ gpio@842800; }; /delete-node/ spu@50003000; - /delete-node/ gpiote@5000d000; /delete-node/ crypto@50844000; }; @@ -112,6 +107,27 @@ }; }; + +&gpiote { + status = "okay"; +}; + +&gpio0 { + status = "okay"; +}; + +&gpio1 { + 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 055bc9e578f..9d31586454a 100644 --- a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.yaml +++ b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.yaml @@ -9,7 +9,7 @@ toolchain: - zephyr testing: ignore_tags: - - gpio - 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 d7d6a2fe75d..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"; @@ -17,15 +18,13 @@ aliases { /delete-property/ sram-0; /delete-property/ sram-1; - /delete-property/ gpiote-0; /delete-property/ wdt-0; /delete-property/ i2c-0; /delete-property/ spi-0; - /delete-property/ gpio-0; - /delete-property/ gpio-1; }; chosen { + zephyr,console = &uart0; zephyr,bt-hci-ipc = &ipc0; nordic,802154-spinel-ipc = &ipc0; zephyr,ieee802154 = &ieee802154; @@ -36,14 +35,11 @@ soc { /delete-node/ memory@20000000; /delete-node/ memory@21000000; - /delete-node/ gpiote@4100a000; /delete-node/ watchdog@4100b000; /delete-node/ i2c@41013000; /delete-node/ spi@41013000; /delete-node/ acl@41080000; /delete-node/ vmc@41081000; - /delete-node/ gpio@418c0500; - /delete-node/ gpio@418c0800; }; /delete-node/ cpus; @@ -73,6 +69,26 @@ }; }; +&gpiote { + status = "okay"; +}; + +&gpio0 { + status = "okay"; +}; + +&gpio1 { + 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 f88fb9c6ca8..a0d6d2caa44 100644 --- a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.yaml +++ b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.yaml @@ -9,7 +9,7 @@ toolchain: - zephyr testing: ignore_tags: - - gpio - modem - - uart - bsim_skip_CI +supported: + - gpio diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts index e6129833778..13bf2e338f8 100644 --- a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts +++ b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts @@ -8,6 +8,7 @@ #include #include +#include <../boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi> / { model = "Nordic NRF54L15 BSIM NRF54L15 Application"; @@ -15,12 +16,12 @@ chosen { zephyr,entropy = &rng; + zephyr,bt-c2h-uart = &uart20; zephyr,flash-controller = &rram_controller; zephyr,flash = &cpuapp_rram; }; /delete-node/ cpus; - /delete-node/ clocks; /delete-node/ sw-pwm; soc { @@ -28,37 +29,27 @@ /delete-node/ memory@2002f000; peripheral@50000000 { /delete-node/ spi@4a000; - /delete-node/ uart@4a000; /delete-node/ vpr@4c000; /delete-node/ mailbox@0; /delete-node/ interrupt-controller@f0000000; - /delete-node/ gpio@50400; /delete-node/ i2c@c6000; /delete-node/ spi@c6000; - /delete-node/ uart@c6000; /delete-node/ i2c@c7000; /delete-node/ spi@c7000; - /delete-node/ uart@c7000; /delete-node/ i2c@c8000; /delete-node/ spi@c8000; - /delete-node/ uart@c8000; /delete-node/ pwm@d2000; /delete-node/ pwm@d3000; /delete-node/ pwm@d4000; /delete-node/ adc@d5000; /delete-node/ nfct@d6000; - /delete-node/ gpio@d8200; - /delete-node/ gpiote@da000; /delete-node/ i2s@dd000; /delete-node/ qdec@e0000; /delete-node/ qdec@e1000; /delete-node/ i2c@104000; /delete-node/ spi@104000; - /delete-node/ uart@104000; /delete-node/ watchdog@108000; /delete-node/ watchdog@109000; - /delete-node/ gpio@10a000; - /delete-node/ gpiote@10c000; }; }; @@ -93,6 +84,45 @@ }; }; +&uart00 { + /delete-property/ clocks; +}; + +&uart20 { + status = "okay"; + current-speed = <115200>; + pinctrl-0 = <&uart20_default>; + pinctrl-1 = <&uart20_sleep>; + pinctrl-names = "default", "sleep"; +}; + +&uart30 { + current-speed = <115200>; + pinctrl-0 = <&uart30_default>; + pinctrl-1 = <&uart30_sleep>; + pinctrl-names = "default", "sleep"; +}; + +&gpio0 { + status = "okay"; +}; + +&gpio1 { + status = "okay"; +}; + +&gpio2 { + status = "okay"; +}; + +&gpiote20 { + status = "okay"; +}; + +&gpiote30 { + status = "okay"; +}; + &temp { status = "okay"; }; diff --git a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.yaml b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.yaml index cbdd257334f..e09184de96d 100644 --- a/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.yaml +++ b/boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.yaml @@ -9,9 +9,8 @@ toolchain: - zephyr supported: - counter + - gpio testing: ignore_tags: - - gpio - modem - - uart - bsim_skip_CI diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi index 6ce4fda00fa..f879e08fa52 100644 --- a/dts/common/nordic/nrf54h20.dtsi +++ b/dts/common/nordic/nrf54h20.dtsi @@ -374,7 +374,7 @@ status = "disabled"; cc-num = <8>; interrupts = <40 NRF_DEFAULT_IRQ_PRIORITY>; - clocks = <&fll16m>; + clocks = <&hfxo>; max-bit-width = <32>; max-frequency = ; prescaler = <0>; @@ -386,7 +386,7 @@ status = "disabled"; cc-num = <8>; interrupts = <41 NRF_DEFAULT_IRQ_PRIORITY>; - clocks = <&fll16m>; + clocks = <&hfxo>; max-bit-width = <32>; max-frequency = ; prescaler = <0>; @@ -398,7 +398,7 @@ status = "disabled"; cc-num = <8>; interrupts = <42 NRF_DEFAULT_IRQ_PRIORITY>; - clocks = <&fll16m>; + clocks = <&hfxo>; max-bit-width = <32>; max-frequency = ; prescaler = <0>; diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi index d06c4814103..a7f72bf5a30 100644 --- a/dts/common/nordic/nrf54l20.dtsi +++ b/dts/common/nordic/nrf54l20.dtsi @@ -52,6 +52,12 @@ #clock-cells = <0>; clock-frequency = ; }; + + hfpll: hfpll { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = ; + }; }; soc { @@ -123,6 +129,7 @@ compatible = "nordic,nrf-uarte"; reg = <0x4d000 0x1000>; interrupts = <77 NRF_DEFAULT_IRQ_PRIORITY>; + clocks = <&hfpll>; status = "disabled"; endtx-stoptx-supported; frame-timeout-supported; @@ -145,7 +152,7 @@ cc-num = <6>; max-bit-width = <32>; interrupts = <85 NRF_DEFAULT_IRQ_PRIORITY>; - max-frequency = ; + clocks = <&hfpll>; prescaler = <0>; }; @@ -174,7 +181,7 @@ cc-num = <8>; max-bit-width = <32>; interrupts = <133 NRF_DEFAULT_IRQ_PRIORITY>; - max-frequency = ; + clocks = <&hfxo>; prescaler = <0>; }; diff --git a/dts/common/nordic/nrf54l_05_10_15.dtsi b/dts/common/nordic/nrf54l_05_10_15.dtsi index eba41095e75..d4e0ee6df00 100644 --- a/dts/common/nordic/nrf54l_05_10_15.dtsi +++ b/dts/common/nordic/nrf54l_05_10_15.dtsi @@ -65,6 +65,12 @@ #clock-cells = <0>; clock-frequency = ; }; + + hfpll: hfpll { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = ; + }; }; soc { @@ -144,6 +150,7 @@ compatible = "nordic,nrf-uarte"; reg = <0x4a000 0x1000>; interrupts = <74 NRF_DEFAULT_IRQ_PRIORITY>; + clocks = <&hfpll>; status = "disabled"; endtx-stoptx-supported; frame-timeout-supported; @@ -184,7 +191,7 @@ cc-num = <6>; max-bit-width = <32>; interrupts = <85 NRF_DEFAULT_IRQ_PRIORITY>; - max-frequency = ; + clocks = <&hfpll>; prescaler = <0>; }; @@ -213,7 +220,7 @@ cc-num = <8>; max-bit-width = <32>; interrupts = <133 NRF_DEFAULT_IRQ_PRIORITY>; - max-frequency = ; + clocks = <&hfxo>; prescaler = <0>; }; diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/common/nordic/nrf9280.dtsi index c9e1742e102..1222f3675ec 100644 --- a/dts/common/nordic/nrf9280.dtsi +++ b/dts/common/nordic/nrf9280.dtsi @@ -88,6 +88,13 @@ #clock-cells = <0>; clock-frequency = ; }; + + hsfll120: hsfll120 { + compatible = "fixed-clock"; + clocks = <&fll16m>; + #clock-cells = <0>; + clock-frequency = ; + }; }; soc { @@ -261,7 +268,7 @@ cc-num = <8>; interrupts = <40 NRF_DEFAULT_IRQ_PRIORITY>; max-bit-width = <32>; - max-frequency = ; + clocks = <&hfxo>; prescaler = <0>; }; @@ -272,7 +279,7 @@ cc-num = <8>; interrupts = <41 NRF_DEFAULT_IRQ_PRIORITY>; max-bit-width = <32>; - max-frequency = ; + clocks = <&hfxo>; prescaler = <0>; }; @@ -283,7 +290,7 @@ cc-num = <8>; interrupts = <42 NRF_DEFAULT_IRQ_PRIORITY>; max-bit-width = <32>; - max-frequency = ; + clocks = <&hfxo>; prescaler = <0>; }; @@ -462,7 +469,7 @@ cc-num = <6>; interrupts = <226 NRF_DEFAULT_IRQ_PRIORITY>; max-bit-width = <32>; - max-frequency = ; + clocks = <&hsfll120>; prescaler = <0>; }; @@ -473,7 +480,7 @@ cc-num = <6>; interrupts = <227 NRF_DEFAULT_IRQ_PRIORITY>; max-bit-width = <32>; - max-frequency = ; + clocks = <&hsfll120>; prescaler = <0>; }; diff --git a/tests/bsim/ci.uart.sh b/tests/bsim/ci.uart.sh index ab49280e130..da305e1fcef 100755 --- a/tests/bsim/ci.uart.sh +++ b/tests/bsim/ci.uart.sh @@ -12,9 +12,15 @@ cd ${ZEPHYR_BASE} set -uex echo "UART: Single device tests" +echo " nRF52833 & 5340:" ${ZEPHYR_BASE}/scripts/twister -T tests/drivers/uart/ --force-color --inline-logs -v -M \ -p nrf52_bsim --fixture gpio_loopback -- -uart0_loopback +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 + echo "UART: Multi device tests" WORK_DIR=${ZEPHYR_BASE}/bsim_uart nice tests/bsim/drivers/uart/compile.sh RESULTS_FILE=${ZEPHYR_BASE}/bsim_out/bsim_results.uart.52.xml \ diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpuapp.conf b/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpuapp.conf new file mode 100644 index 00000000000..b9d02cf11d5 --- /dev/null +++ b/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpuapp.conf @@ -0,0 +1 @@ +CONFIG_SKIP_PULL_TEST=y diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpuapp.overlay new file mode 100644 index 00000000000..2edc8260dc3 --- /dev/null +++ b/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpuapp.overlay @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "nrf52_bsim.overlay" diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpunet.conf b/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpunet.conf new file mode 100644 index 00000000000..b9d02cf11d5 --- /dev/null +++ b/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpunet.conf @@ -0,0 +1 @@ +CONFIG_SKIP_PULL_TEST=y diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpunet.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpunet.overlay new file mode 100644 index 00000000000..2edc8260dc3 --- /dev/null +++ b/tests/drivers/gpio/gpio_basic_api/boards/nrf5340bsim_nrf5340_cpunet.overlay @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "nrf52_bsim.overlay" diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.conf b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.conf new file mode 100644 index 00000000000..b9d02cf11d5 --- /dev/null +++ b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.conf @@ -0,0 +1 @@ +CONFIG_SKIP_PULL_TEST=y diff --git a/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay new file mode 100644 index 00000000000..2edc8260dc3 --- /dev/null +++ b/tests/drivers/gpio/gpio_basic_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "nrf52_bsim.overlay" diff --git a/tests/drivers/gpio/gpio_basic_api/testcase.yaml b/tests/drivers/gpio/gpio_basic_api/testcase.yaml index df924719f30..3e7d1d1fcba 100644 --- a/tests/drivers/gpio/gpio_basic_api/testcase.yaml +++ b/tests/drivers/gpio/gpio_basic_api/testcase.yaml @@ -13,7 +13,12 @@ tests: filter: dt_compat_enabled("test-gpio-basic-api") and not dt_compat_enabled("arduino-header-r3") drivers.gpio.nrf_sense_edge: - platform_allow: nrf52840dk/nrf52840 nrf52_bsim + platform_allow: + - nrf52840dk/nrf52840 + - nrf52_bsim + - nrf5340bsim/nrf5340/cpuapp + - nrf5340bsim/nrf5340/cpunet + - nrf54l15bsim/nrf54l15/cpuapp extra_args: "DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840.overlay;\ boards/nrf52840dk_nrf52840_sense_edge.overlay" diff --git a/tests/drivers/gpio/gpio_get_direction/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/tests/drivers/gpio/gpio_get_direction/boards/nrf5340bsim_nrf5340_cpuapp.overlay new file mode 100644 index 00000000000..2edc8260dc3 --- /dev/null +++ b/tests/drivers/gpio/gpio_get_direction/boards/nrf5340bsim_nrf5340_cpuapp.overlay @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "nrf52_bsim.overlay" diff --git a/tests/drivers/gpio/gpio_get_direction/boards/nrf5340bsim_nrf5340_cpunet.overlay b/tests/drivers/gpio/gpio_get_direction/boards/nrf5340bsim_nrf5340_cpunet.overlay new file mode 100644 index 00000000000..2edc8260dc3 --- /dev/null +++ b/tests/drivers/gpio/gpio_get_direction/boards/nrf5340bsim_nrf5340_cpunet.overlay @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "nrf52_bsim.overlay" diff --git a/tests/drivers/gpio/gpio_get_direction/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay b/tests/drivers/gpio/gpio_get_direction/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay new file mode 100644 index 00000000000..2edc8260dc3 --- /dev/null +++ b/tests/drivers/gpio/gpio_get_direction/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "nrf52_bsim.overlay" diff --git a/tests/drivers/gpio/gpio_hogs/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/tests/drivers/gpio/gpio_hogs/boards/nrf5340bsim_nrf5340_cpuapp.overlay new file mode 100644 index 00000000000..e84f379d899 --- /dev/null +++ b/tests/drivers/gpio/gpio_hogs/boards/nrf5340bsim_nrf5340_cpuapp.overlay @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2023 Vestas Wind Systems A/S + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "nrf52_bsim.overlay" diff --git a/tests/drivers/gpio/gpio_hogs/boards/nrf5340bsim_nrf5340_cpunet.overlay b/tests/drivers/gpio/gpio_hogs/boards/nrf5340bsim_nrf5340_cpunet.overlay new file mode 100644 index 00000000000..e84f379d899 --- /dev/null +++ b/tests/drivers/gpio/gpio_hogs/boards/nrf5340bsim_nrf5340_cpunet.overlay @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2023 Vestas Wind Systems A/S + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "nrf52_bsim.overlay" diff --git a/tests/drivers/gpio/gpio_hogs/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay b/tests/drivers/gpio/gpio_hogs/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay new file mode 100644 index 00000000000..6bf18e1faa1 --- /dev/null +++ b/tests/drivers/gpio/gpio_hogs/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2023 Vestas Wind Systems A/S + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include + +/ { + zephyr,user { + output-high-gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; + output-low-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>; + input-gpios = <&gpio0 1 GPIO_ACTIVE_LOW>; + }; +}; + +&gpio0 { + hog1 { + gpio-hog; + gpios = <3 GPIO_ACTIVE_LOW>; + output-high; + }; + + hog2 { + gpio-hog; + gpios = <4 GPIO_ACTIVE_HIGH>; + output-low; + }; + + hog3 { + gpio-hog; + gpios = <1 GPIO_ACTIVE_LOW>; + input; + }; +}; diff --git a/tests/drivers/gpio/gpio_hogs/testcase.yaml b/tests/drivers/gpio/gpio_hogs/testcase.yaml index 998d68d7c67..fa3108e21e6 100644 --- a/tests/drivers/gpio/gpio_hogs/testcase.yaml +++ b/tests/drivers/gpio/gpio_hogs/testcase.yaml @@ -11,6 +11,9 @@ tests: - nrf52840dk/nrf52840 - nucleo_g474re - nrf52_bsim + - nrf5340bsim/nrf5340/cpuapp + - nrf5340bsim/nrf5340/cpunet + - nrf54l15bsim/nrf54l15/cpuapp - mr_canhubk3 - s32z2xxdc2/s32z270/rtu0 - s32z2xxdc2/s32z270/rtu1 diff --git a/tests/drivers/uart/uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.conf b/tests/drivers/uart/uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.conf new file mode 100644 index 00000000000..e7a460fde6b --- /dev/null +++ b/tests/drivers/uart/uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.conf @@ -0,0 +1,2 @@ +CONFIG_UART_1_NRF_HW_ASYNC_TIMER=1 +CONFIG_UART_NRFX_UARTE_ENHANCED_RX=y diff --git a/tests/drivers/uart/uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/tests/drivers/uart/uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.overlay new file mode 100644 index 00000000000..bfd4f8676f1 --- /dev/null +++ b/tests/drivers/uart/uart_async_api/boards/nrf5340bsim_nrf5340_cpuapp.overlay @@ -0,0 +1,3 @@ +/* SPDX-License-Identifier: Apache-2.0 */ + +#include "nrf5340dk_nrf5340_cpuapp.overlay" diff --git a/tests/drivers/uart/uart_async_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_async_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay new file mode 100644 index 00000000000..10b8825014f --- /dev/null +++ b/tests/drivers/uart/uart_async_api/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay @@ -0,0 +1,3 @@ +/* SPDX-License-Identifier: Apache-2.0 */ + +#include "nrf54l15dk_nrf54l15_cpuapp.overlay" diff --git a/tests/drivers/uart/uart_async_api/testcase.yaml b/tests/drivers/uart/uart_async_api/testcase.yaml index e7a970d4a58..3d7a7b3675a 100644 --- a/tests/drivers/uart/uart_async_api/testcase.yaml +++ b/tests/drivers/uart/uart_async_api/testcase.yaml @@ -26,7 +26,11 @@ tests: integration_platforms: - nucleo_h743zi drivers.uart.async_api.nrf_uarte_new: - platform_allow: nrf52840dk/nrf52840 nrf52_bsim + platform_allow: + - nrf52840dk/nrf52840 + - nrf52_bsim + - nrf5340bsim/nrf5340/cpuapp + - nrf54l15bsim/nrf54l15/cpuapp filter: CONFIG_SERIAL_SUPPORT_ASYNC harness: ztest harness_config: diff --git a/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf5340bsim_nrf5340_cpuapp.overlay new file mode 100644 index 00000000000..bfd4f8676f1 --- /dev/null +++ b/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf5340bsim_nrf5340_cpuapp.overlay @@ -0,0 +1,3 @@ +/* SPDX-License-Identifier: Apache-2.0 */ + +#include "nrf5340dk_nrf5340_cpuapp.overlay" diff --git a/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay new file mode 100644 index 00000000000..10b8825014f --- /dev/null +++ b/tests/drivers/uart/uart_mix_fifo_poll/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay @@ -0,0 +1,3 @@ +/* SPDX-License-Identifier: Apache-2.0 */ + +#include "nrf54l15dk_nrf54l15_cpuapp.overlay" diff --git a/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml b/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml index 1b13bc57166..13f1d52d4d5 100644 --- a/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml +++ b/tests/drivers/uart/uart_mix_fifo_poll/testcase.yaml @@ -8,7 +8,9 @@ common: - nrf52840dk/nrf52840 - nrf9160dk/nrf9160 - nrf5340dk/nrf5340/cpuapp + - nrf5340bsim/nrf5340/cpuapp - nrf54l15dk/nrf54l15/cpuapp + - nrf54l15bsim/nrf54l15/cpuapp - nrf54h20dk/nrf54h20/cpuapp - nrf54h20dk/nrf54h20/cpurad - nrf52_bsim diff --git a/tests/drivers/uart/uart_pm/boards/nrf5340bsim_nrf5340_cpuapp.overlay b/tests/drivers/uart/uart_pm/boards/nrf5340bsim_nrf5340_cpuapp.overlay new file mode 100644 index 00000000000..c7277e73775 --- /dev/null +++ b/tests/drivers/uart/uart_pm/boards/nrf5340bsim_nrf5340_cpuapp.overlay @@ -0,0 +1,3 @@ +/* SPDX-License-Identifier: Apache-2.0 */ + +#include "nrf52840dk_nrf52840.overlay" diff --git a/tests/drivers/uart/uart_pm/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay b/tests/drivers/uart/uart_pm/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay new file mode 100644 index 00000000000..10b8825014f --- /dev/null +++ b/tests/drivers/uart/uart_pm/boards/nrf54l15bsim_nrf54l15_cpuapp.overlay @@ -0,0 +1,3 @@ +/* SPDX-License-Identifier: Apache-2.0 */ + +#include "nrf54l15dk_nrf54l15_cpuapp.overlay" diff --git a/tests/drivers/uart/uart_pm/testcase.yaml b/tests/drivers/uart/uart_pm/testcase.yaml index 9a7729c8236..29c336441c6 100644 --- a/tests/drivers/uart/uart_pm/testcase.yaml +++ b/tests/drivers/uart/uart_pm/testcase.yaml @@ -6,8 +6,10 @@ common: platform_allow: - nrf52840dk/nrf52840 - nrf54l15dk/nrf54l15/cpuapp + - nrf54l15bsim/nrf54l15/cpuapp - nrf54h20dk/nrf54h20/cpuapp - nrf52_bsim + - nrf5340bsim/nrf5340/cpuapp harness_config: fixture: gpio_loopback depends_on: gpio @@ -28,6 +30,7 @@ tests: extra_args: DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840.overlay;nrf_rx_disable.overlay" platform_exclude: - nrf54l15dk/nrf54l15/cpuapp + - nrf54l15bsim/nrf54l15/cpuapp - nrf54h20dk/nrf54h20/cpuapp drivers.uart.pm.enhanced_poll: