From b4242a8dabd8eac64c3eae7dd80c8f2f5c2f4900 Mon Sep 17 00:00:00 2001 From: Johann Fischer Date: Wed, 19 May 2021 14:46:04 +0200 Subject: [PATCH] boards: add USB node aliases USB devicetree nodes in Zephyr have different names, mostly derived from the designations in data sheets. We also have an USB audio sample which has a kind of experimental approach to configure audio devices, that are not real hardware, via devicetree. Sample itself is generic and can be run on any board with USB device controller and isochronous endpoints support. Add usbd0 alias to specific USB node to allow generic USB audio sample to be build on nRF and i.MX RT boards. Signed-off-by: Johann Fischer --- boards/arm/mimxrt1010_evk/mimxrt1010_evk.dts | 1 + boards/arm/mimxrt1015_evk/mimxrt1015_evk.dts | 1 + boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts | 1 + boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts | 1 + boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts | 1 + boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts | 1 + boards/arm/nrf21540dk_nrf52840/nrf21540dk_nrf52840.dts | 1 + boards/arm/nrf52833dk_nrf52820/nrf52833dk_nrf52820.dts | 1 + boards/arm/nrf52833dk_nrf52833/nrf52833dk_nrf52833.dts | 1 + boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840.dts | 1 + .../arm/nrf52840dongle_nrf52840/nrf52840dongle_nrf52840.dts | 1 + boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpuapp.dts | 4 ++++ boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpuappns.dts | 4 ++++ boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpuapp.dts | 4 ++++ boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpuappns.dts | 4 ++++ 15 files changed, 27 insertions(+) diff --git a/boards/arm/mimxrt1010_evk/mimxrt1010_evk.dts b/boards/arm/mimxrt1010_evk/mimxrt1010_evk.dts index 95ad9f373e8..a24a148851f 100644 --- a/boards/arm/mimxrt1010_evk/mimxrt1010_evk.dts +++ b/boards/arm/mimxrt1010_evk/mimxrt1010_evk.dts @@ -15,6 +15,7 @@ aliases { led0 = &green_led; sw0 = &user_button; + usbd0 = &usb1; }; chosen { diff --git a/boards/arm/mimxrt1015_evk/mimxrt1015_evk.dts b/boards/arm/mimxrt1015_evk/mimxrt1015_evk.dts index f8d7373a7d3..d0090de7316 100644 --- a/boards/arm/mimxrt1015_evk/mimxrt1015_evk.dts +++ b/boards/arm/mimxrt1015_evk/mimxrt1015_evk.dts @@ -15,6 +15,7 @@ aliases { led0 = &green_led; sw0 = &user_button; + usbd0 = &usb1; }; chosen { diff --git a/boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts b/boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts index 02e1da6a2a9..9573caa5831 100644 --- a/boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts +++ b/boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts @@ -15,6 +15,7 @@ aliases { led0 = &green_led; sw0 = &user_button; + usbd0 = &usb1; }; chosen { diff --git a/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts b/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts index 35ef2b9f258..267a09a07c3 100644 --- a/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts +++ b/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts @@ -17,6 +17,7 @@ sw0 = &user_button; kscan0 = &touch_controller; watchdog0 = &wdog0; + usbd0 = &usb1; }; chosen { diff --git a/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts b/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts index b814b6721b1..e50c44e09ed 100644 --- a/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts +++ b/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts @@ -17,6 +17,7 @@ sw0 = &user_button; kscan0 = &touch_controller; watchdog0 = &wdog0; + usbd0 = &usb1; }; chosen { diff --git a/boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts b/boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts index dda42d0b7cf..6b879e186a6 100644 --- a/boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts +++ b/boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts @@ -17,6 +17,7 @@ pwm-led0 = &green_pwm_led; sw0 = &user_button; kscan0 = &touch_controller; + usbd0 = &usb1; }; chosen { diff --git a/boards/arm/nrf21540dk_nrf52840/nrf21540dk_nrf52840.dts b/boards/arm/nrf21540dk_nrf52840/nrf21540dk_nrf52840.dts index 554a5e7be8a..9b611f067a0 100644 --- a/boards/arm/nrf21540dk_nrf52840/nrf21540dk_nrf52840.dts +++ b/boards/arm/nrf21540dk_nrf52840/nrf21540dk_nrf52840.dts @@ -132,6 +132,7 @@ sw2 = &button2; sw3 = &button3; bootloader-led0 = &led0; + usbd0 = &usbd; }; }; diff --git a/boards/arm/nrf52833dk_nrf52820/nrf52833dk_nrf52820.dts b/boards/arm/nrf52833dk_nrf52820/nrf52833dk_nrf52820.dts index ff50590a8bf..0c7033526f9 100644 --- a/boards/arm/nrf52833dk_nrf52820/nrf52833dk_nrf52820.dts +++ b/boards/arm/nrf52833dk_nrf52820/nrf52833dk_nrf52820.dts @@ -80,6 +80,7 @@ sw2 = &button2; sw3 = &button3; bootloader-led0 = &led0; + usbd0 = &usbd; }; }; diff --git a/boards/arm/nrf52833dk_nrf52833/nrf52833dk_nrf52833.dts b/boards/arm/nrf52833dk_nrf52833/nrf52833dk_nrf52833.dts index 23796c644e0..b3c66aa551d 100644 --- a/boards/arm/nrf52833dk_nrf52833/nrf52833dk_nrf52833.dts +++ b/boards/arm/nrf52833dk_nrf52833/nrf52833dk_nrf52833.dts @@ -110,6 +110,7 @@ sw2 = &button2; sw3 = &button3; bootloader-led0 = &led0; + usbd0 = &usbd; }; }; diff --git a/boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840.dts b/boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840.dts index b1dafdcdec8..3bead6c7f04 100644 --- a/boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840.dts +++ b/boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840.dts @@ -121,6 +121,7 @@ sw2 = &button2; sw3 = &button3; bootloader-led0 = &led0; + usbd0 = &usbd; }; }; diff --git a/boards/arm/nrf52840dongle_nrf52840/nrf52840dongle_nrf52840.dts b/boards/arm/nrf52840dongle_nrf52840/nrf52840dongle_nrf52840.dts index 58b04902057..e38d208ab2a 100644 --- a/boards/arm/nrf52840dongle_nrf52840/nrf52840dongle_nrf52840.dts +++ b/boards/arm/nrf52840dongle_nrf52840/nrf52840dongle_nrf52840.dts @@ -81,6 +81,7 @@ red-pwm-led = &red_pwm_led; green-pwm-led = &green_pwm_led; blue-pwm-led = &blue_pwm_led; + usbd0 = &usbd; }; }; diff --git a/boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpuapp.dts b/boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpuapp.dts index 8a5f87e432b..f070b1e4804 100644 --- a/boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpuapp.dts +++ b/boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpuapp.dts @@ -19,6 +19,10 @@ zephyr,sram-secure-partition = &sram0_s; zephyr,sram-non-secure-partition = &sram0_ns; }; + + aliases { + usbd0 = &usbd; + }; }; &spi2 { diff --git a/boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpuappns.dts b/boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpuappns.dts index 5e3189d7dc3..8693164008c 100644 --- a/boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpuappns.dts +++ b/boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpuappns.dts @@ -17,6 +17,10 @@ zephyr,flash = &flash0; zephyr,code-partition = &slot0_ns_partition; }; + + aliases { + usbd0 = &usbd; + }; }; &usbd { diff --git a/boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpuapp.dts b/boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpuapp.dts index aaec861a69d..c9e3dc1fddb 100644 --- a/boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpuapp.dts +++ b/boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpuapp.dts @@ -19,6 +19,10 @@ zephyr,sram-secure-partition = &sram0_s; zephyr,sram-non-secure-partition = &sram0_ns; }; + + aliases { + usbd0 = &usbd; + }; }; &usbd { diff --git a/boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpuappns.dts b/boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpuappns.dts index 43c909b1804..9ebf3efa6a5 100644 --- a/boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpuappns.dts +++ b/boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpuappns.dts @@ -17,6 +17,10 @@ zephyr,flash = &flash0; zephyr,code-partition = &slot0_ns_partition; }; + + aliases { + usbd0 = &usbd; + }; }; &usbd {