Skip to content

Commit 6f6346a

Browse files
committed
variants: fix multiple USB definition issues
Always use the new 'board_cdc_acm_uart' definition for USB CDC ACM interfaces. This is the new standard for Zephyr serial-over-USB.
1 parent b3d897d commit 6f6346a

File tree

6 files changed

+25
-32
lines changed

6 files changed

+25
-32
lines changed

variants/arduino_giga_r1_stm32h747xx_m7/arduino_giga_r1_stm32h747xx_m7.overlay

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
&zephyr_udc0 {
2-
cdc_acm_uart0: cdc_acm_uart0 {
2+
board_cdc_acm_uart: board_cdc_acm_uart {
33
compatible = "zephyr,cdc-acm-uart";
4-
status = "okay";
4+
status = "okay";
55
};
66
};
77

@@ -322,7 +322,7 @@
322322
/{
323323
chosen {
324324
zephyr,camera = &dcmi;
325-
/* zephyr,console = &cdc_acm_uart0; */
325+
/* zephyr,console = &board_cdc_acm_uart; */
326326
};
327327

328328
/* used to overcome problems with _C analog pins */
@@ -491,8 +491,8 @@
491491
<&gpioa 4 0>,
492492
<&gpioa 5 0>;
493493

494-
serials = <&cdc_acm_uart0>, <&usart1>, <&usart2>, <&uart4>, <&usart6>;
495-
cdc-acm = <&cdc_acm_uart0>;
494+
serials = <&board_cdc_acm_uart>, <&usart1>, <&usart2>, <&uart4>, <&usart6>;
495+
cdc-acm = <&board_cdc_acm_uart>;
496496
i2cs = <&i2c2>, <&i2c4>, <&i2c1>;
497497
spis = <&spi1>, <&spi5>;
498498
pwms = <&pwm1 3 PWM_HZ(12000000) PWM_POLARITY_NORMAL>,

variants/arduino_nano_33_ble_nrf52840_sense/arduino_nano_33_ble_nrf52840_sense.overlay

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
&zephyr_udc0 {
2-
cdc_acm_uart0: cdc_acm_uart0 {
2+
board_cdc_acm_uart: board_cdc_acm_uart {
33
compatible = "zephyr,cdc-acm-uart";
4-
status = "okay";
4+
status = "okay";
55
};
66
};
77

@@ -118,8 +118,8 @@
118118
<&adc 4>,
119119
<&adc 1>;
120120

121-
serials = <&cdc_acm_uart0>, <&uart0>;
122-
cdc-acm = <&cdc_acm_uart0>;
121+
serials = <&board_cdc_acm_uart>, <&uart0>;
122+
cdc-acm = <&board_cdc_acm_uart>;
123123
i2cs = <&arduino_nano_i2c>, <&i2c1>;
124124
};
125125
};

variants/arduino_portenta_c33_r7fa6m5bh3cfc/arduino_portenta_c33_r7fa6m5bh3cfc.overlay

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
&zephyr_udc0 {
2-
cdc_acm_uart0: cdc_acm_uart0 {
2+
board_cdc_acm_uart: board_cdc_acm_uart {
33
compatible = "zephyr,cdc-acm-uart";
4-
status = "okay";
4+
status = "okay";
55
};
66
};
77

@@ -72,8 +72,8 @@
7272

7373
pwm-pin-gpios = <&ioport6 0 0>;
7474

75-
serials = <&cdc_acm_uart0>, <&uart9>;
76-
cdc-acm = <&cdc_acm_uart0>;
75+
serials = <&board_cdc_acm_uart>, <&uart9>;
76+
cdc-acm = <&board_cdc_acm_uart>;
7777
i2cs = <&iic1>;
7878
spis = <&spi1>;
7979
pwms = <&pwm6 1 PWM_HZ(25000000) PWM_POLARITY_NORMAL>;

variants/arduino_portenta_h7_stm32h747xx_m7/arduino_portenta_h7_stm32h747xx_m7.overlay

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
&zephyr_udc0 {
2-
cdc_acm_uart0: cdc_acm_uart0 {
3-
compatible = "zephyr,cdc-acm-uart";
4-
status = "okay";
5-
};
1+
&board_cdc_acm_uart {
2+
status = "okay";
63
};
74

85
&usart1 {
@@ -17,10 +14,6 @@
1714
status = "okay";
1815
};
1916

20-
&cdc_acm_uart0 {
21-
status = "okay";
22-
};
23-
2417
&i2c4 {
2518
status = "okay";
2619
};
@@ -87,8 +80,8 @@
8780
<&gpiok 6 GPIO_ACTIVE_LOW>,
8881
<&gpiok 7 GPIO_ACTIVE_LOW>;
8982

90-
serials = <&cdc_acm_uart0>,<&usart6>, <&usart1>, <&uart4>;
91-
cdc-acm = <&cdc_acm_uart0>;
83+
serials = <&board_cdc_acm_uart>,<&usart6>, <&usart1>, <&uart4>;
84+
cdc-acm = <&board_cdc_acm_uart>;
9285
i2cs = <&i2c4>;
9386
};
9487
};

variants/frdm_mcxn947_mcxn947_cpu0/frdm_mcxn947_mcxn947_cpu0.overlay

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
&zephyr_udc0 {
22
status = "okay";
3-
cdc_acm_uart0: cdc_acm_uart0 {
3+
board_cdc_acm_uart: board_cdc_acm_uart {
44
compatible = "zephyr,cdc-acm-uart";
55
status = "okay";
66
};
@@ -22,9 +22,9 @@
2222
zephyr,user {
2323
digital-pin-gpios = <&gpio0 10 GPIO_ACTIVE_LOW>, <&gpio0 27 GPIO_ACTIVE_LOW>, <&gpio1 2 GPIO_ACTIVE_LOW>;
2424
builtin-led-gpios = <&gpio0 10 GPIO_ACTIVE_LOW>, <&gpio0 27 GPIO_ACTIVE_LOW>, <&gpio1 2 GPIO_ACTIVE_LOW>;
25-
serials = <&cdc_acm_uart0>, <&flexcomm4_lpuart4>;
26-
cdc-acm = <&cdc_acm_uart0>;
25+
serials = <&board_cdc_acm_uart>, <&flexcomm4_lpuart4>;
26+
cdc-acm = <&board_cdc_acm_uart>;
2727
i2cs = <&flexcomm2_lpi2c2>;
2828
spis = <&flexcomm1_lpspi1>;
2929
};
30-
};
30+
};

variants/frdm_rw612_rw612/frdm_rw612_rw612.overlay

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
&zephyr_udc0 {
22
status = "okay";
3-
cdc_acm_uart0: cdc_acm_uart0 {
3+
board_cdc_acm_uart: board_cdc_acm_uart {
44
compatible = "zephyr,cdc-acm-uart";
55
status = "okay";
66
};
@@ -21,9 +21,9 @@
2121
zephyr,user {
2222
digital-pin-gpios = <&hsgpio0 12 GPIO_ACTIVE_LOW>;
2323
builtin-led-gpios = <&hsgpio0 12 GPIO_ACTIVE_LOW>;
24-
serials = <&cdc_acm_uart0>;
25-
cdc-acm = <&cdc_acm_uart0>;
24+
serials = <&board_cdc_acm_uart>;
25+
cdc-acm = <&board_cdc_acm_uart>;
2626
i2cs = <&arduino_i2c>;
2727
spis = <&flexcomm1>;
2828
};
29-
};
29+
};

0 commit comments

Comments
 (0)