diff --git a/boards/nordic/nrf54lm20dk/nrf54lm20dk_nrf54lm20a_cpuapp.yaml b/boards/nordic/nrf54lm20dk/nrf54lm20dk_nrf54lm20a_cpuapp.yaml index 765845fa27f..e5a2b89087d 100644 --- a/boards/nordic/nrf54lm20dk/nrf54lm20dk_nrf54lm20a_cpuapp.yaml +++ b/boards/nordic/nrf54lm20dk/nrf54lm20dk_nrf54lm20a_cpuapp.yaml @@ -20,4 +20,5 @@ supported: - i2s - pwm - spi + - usbd - watchdog diff --git a/samples/subsys/usb/cdc_acm/sample.yaml b/samples/subsys/usb/cdc_acm/sample.yaml index 875bfb335b5..4cebbca30e5 100644 --- a/samples/subsys/usb/cdc_acm/sample.yaml +++ b/samples/subsys/usb/cdc_acm/sample.yaml @@ -1,22 +1,26 @@ sample: name: CDC ACM USB +common: + tags: usb + harness: console + harness_config: + type: multi_line + regex: + - "Wait for DTR" + - "cdc_acm_echo: USBD message: CDC ACM control line state" + - "cdc_acm_echo: USBD message: CDC ACM line coding" + - "cdc_acm_echo: Baudrate 115200" tests: sample.usb.cdc-acm: depends_on: usb_device - tags: usb arch_exclude: posix - harness: console - harness_config: - type: one_line - regex: - - "Wait for DTR" sample.usb_device_next.cdc-acm: depends_on: usbd - tags: usb extra_args: CONF_FILE="usbd_next_prj.conf" integration_platforms: - nrf52840dk/nrf52840 - nrf54h20dk/nrf54h20/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp - frdm_k64f - stm32f723e_disco - nucleo_f413zh @@ -25,27 +29,15 @@ tests: - max32690evkit/max32690/m4 - samd21_xpro - same54_xpro - harness: console - harness_config: - type: one_line - regex: - - "Wait for DTR" sample.usb_device_next.cdc-acm-workqueue: depends_on: usbd - tags: usb extra_args: - CONF_FILE="usbd_next_prj.conf" - DCONFIG_USBD_CDC_ACM_WORKQUEUE=y integration_platforms: - frdm_k64f - harness: console - harness_config: - type: one_line - regex: - - "Wait for DTR" sample.usb.cdc-acm.buildonly: depends_on: usb_device - tags: usb arch_allow: posix build_only: true integration_platforms: diff --git a/samples/subsys/usb/hid-keyboard/sample.yaml b/samples/subsys/usb/hid-keyboard/sample.yaml index 6161ff90c2c..6b9c51a3864 100644 --- a/samples/subsys/usb/hid-keyboard/sample.yaml +++ b/samples/subsys/usb/hid-keyboard/sample.yaml @@ -1,14 +1,27 @@ sample: name: USB HID keyboard sample common: - harness: button filter: dt_alias_exists("sw0") and dt_alias_exists("led0") depends_on: - usbd - gpio + tags: usb + timeout: 15 + harness: console + harness_config: + type: multi_line + ordered: false + regex: + - "HS bNumConfigurations 1" + - "FS bNumConfigurations 1" + - "HID keyboard sample is initialized" + - "USBD message: VBUS ready" + - "Actual device speed 2" + - "s-in-status finished" integration_platforms: - nrf52840dk/nrf52840 - nrf54h20dk/nrf54h20/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp - frdm_k64f - stm32f723e_disco - nucleo_f413zh @@ -17,17 +30,13 @@ common: - samd21_xpro - same54_xpro tests: - sample.usbd.hid-keyboard: - tags: usb + sample.usbd.hid-keyboard: {} sample.usbd.hid-keyboard.out-report: - tags: usb extra_args: - EXTRA_DTC_OVERLAY_FILE="out_report.overlay" sample.usbd.hid-keyboard.large-report: - tags: usb extra_args: - EXTRA_DTC_OVERLAY_FILE="large_in_report.overlay" sample.usbd.hid-keyboard.large-out-report: - tags: usb extra_args: - EXTRA_DTC_OVERLAY_FILE="large_out_report.overlay" diff --git a/samples/subsys/usb/hid-mouse/sample.yaml b/samples/subsys/usb/hid-mouse/sample.yaml index 132c71c928b..6ec66351924 100644 --- a/samples/subsys/usb/hid-mouse/sample.yaml +++ b/samples/subsys/usb/hid-mouse/sample.yaml @@ -5,19 +5,29 @@ common: filter: dt_alias_exists("sw0") and dt_alias_exists("led0") depends_on: - gpio + tags: usb tests: sample.usb.hid-mouse: depends_on: - usb_device platform_exclude: - frdm_mcxn947/mcxn947/cpu0 - tags: usb sample.usb_device_next.hid-mouse: depends_on: - usbd + timeout: 15 + harness: console + harness_config: + type: multi_line + regex: + - "HS bNumConfigurations 1" + - "FS bNumConfigurations 1" + - "Actual device speed 2" + - "s-in-status finished" integration_platforms: - nrf52840dk/nrf52840 - nrf54h20dk/nrf54h20/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp - frdm_k64f - stm32f723e_disco - nucleo_f413zh @@ -26,4 +36,3 @@ tests: extra_args: - CONF_FILE="usbd_next_prj.conf" - EXTRA_DTC_OVERLAY_FILE="usbd_next.overlay" - tags: usb diff --git a/samples/subsys/usb/mass/sample.yaml b/samples/subsys/usb/mass/sample.yaml index 4dbf2126798..97d73cdeb00 100644 --- a/samples/subsys/usb/mass/sample.yaml +++ b/samples/subsys/usb/mass/sample.yaml @@ -25,6 +25,7 @@ tests: integration_platforms: - nrf52840dk/nrf52840 - nrf54h20dk/nrf54h20/cpuapp + - nrf54lm20dk/nrf54lm20a/cpuapp - frdm_k64f - stm32f723e_disco - nucleo_f413zh @@ -46,6 +47,8 @@ tests: regex: - "No file system selected" - "The device is put in USB mass storage mode." + - "usbd_msc: Enable" + - "usbd_msc: Bulk-Only Mass Storage Reset" sample.usb.mass_ram_fat: min_ram: 128 depends_on: usb_device @@ -116,6 +119,8 @@ tests: regex: - "End of files" - "The device is put in USB mass storage mode." + - "usbd_msc: Enable" + - "usbd_msc: Bulk-Only Mass Storage Reset" sample.usb.mass_sdhc_fatfs: min_ram: 32 filter: dt_compat_enabled("zephyr,sdmmc-disk")