Browse Source

refactor: Move the DT based CDC ACM setup.

xmkb
Peter Johanson 3 years ago committed by Pete Johanson
parent
commit
c5ab8a9444
  1. 9
      app/Kconfig
  2. 5
      app/boards/arm/bdn9/bdn9_rev2.dts
  3. 5
      app/boards/arm/bluemicro840/bluemicro840_v1.dts
  4. 5
      app/boards/arm/bt60/bt60.dtsi
  5. 5
      app/boards/arm/dz60rgb/dz60rgb_rev1.dts
  6. 5
      app/boards/arm/ferris/ferris_rev02.dts
  7. 5
      app/boards/arm/mikoto/mikoto_520.dts
  8. 5
      app/boards/arm/nice60/nice60.dts
  9. 5
      app/boards/arm/nice_nano/nice_nano.dtsi
  10. 5
      app/boards/arm/nrf52840_m2/nrf52840_m2.dts
  11. 5
      app/boards/arm/nrfmicro/nrfmicro_11.dts
  12. 5
      app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts
  13. 5
      app/boards/arm/nrfmicro/nrfmicro_13.dts
  14. 5
      app/boards/arm/planck/planck_rev6.dts
  15. 5
      app/boards/arm/s40nc/s40nc.dts

9
app/Kconfig

@ -477,15 +477,6 @@ config ZMK_LOG_LEVEL @@ -477,15 +477,6 @@ config ZMK_LOG_LEVEL
config USB_CDC_ACM_RINGBUF_SIZE
default 1024
config USB_CDC_ACM_DEVICE_NAME
default "CDC_ACM"
config USB_CDC_ACM_DEVICE_COUNT
default 1
config UART_CONSOLE_ON_DEV_NAME
default "CDC_ACM_0"
config LOG_BUFFER_SIZE
default 8192

5
app/boards/arm/bdn9/bdn9_rev2.dts

@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
chosen {
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,console = &cdc_acm_uart;
zmk,kscan = &kscan;
/* TODO: Enable once the GPIO bitbanging driver supports STM32
zmk,underglow = &led_strip;
@ -82,6 +83,10 @@ @@ -82,6 +83,10 @@
&usb {
status = "okay";
cdc_acm_uart: cdc_acm_uart {
compatible = "zephyr,cdc-acm-uart";
label = "CDC_ACM_0";
};
};
&rtc {

5
app/boards/arm/bluemicro840/bluemicro840_v1.dts

@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
zephyr,code-partition = &code_partition;
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,console = &cdc_acm_uart;
};
leds {
@ -73,6 +74,10 @@ @@ -73,6 +74,10 @@
&usbd {
status = "okay";
cdc_acm_uart: cdc_acm_uart {
compatible = "zephyr,cdc-acm-uart";
label = "CDC_ACM_0";
};
};

5
app/boards/arm/bt60/bt60.dtsi

@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
zephyr,code-partition = &code_partition;
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,console = &cdc_acm_uart;
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
};
@ -84,6 +85,10 @@ @@ -84,6 +85,10 @@
&usbd {
status = "okay";
cdc_acm_uart: cdc_acm_uart {
compatible = "zephyr,cdc-acm-uart";
label = "CDC_ACM_0";
};
};

5
app/boards/arm/dz60rgb/dz60rgb_rev1.dts

@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
chosen {
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,console = &cdc_acm_uart;
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
};
@ -67,6 +68,10 @@ RC(4,0) RC(4,1) RC(4,2) RC(4,5) RC( @@ -67,6 +68,10 @@ RC(4,0) RC(4,1) RC(4,2) RC(4,5) RC(
&usb {
status = "okay";
cdc_acm_uart: cdc_acm_uart {
compatible = "zephyr,cdc-acm-uart";
label = "CDC_ACM_0";
};
};
&flash0 {

5
app/boards/arm/ferris/ferris_rev02.dts

@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
chosen {
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,console = &cdc_acm_uart;
zmk,kscan = &kscan;
zmk,matrix_transform = &transform;
/* TODO: Enable once we support the IC for underglow
@ -118,6 +119,10 @@ @@ -118,6 +119,10 @@
&rtc {
status = "okay";
cdc_acm_uart: cdc_acm_uart {
compatible = "zephyr,cdc-acm-uart";
label = "CDC_ACM_0";
};
};
&flash0 {

5
app/boards/arm/mikoto/mikoto_520.dts

@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
zephyr,code-partition = &code_partition;
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,console = &cdc_acm_uart;
};
leds {
@ -72,6 +73,10 @@ @@ -72,6 +73,10 @@
&usbd {
status = "okay";
cdc_acm_uart: cdc_acm_uart {
compatible = "zephyr,cdc-acm-uart";
label = "CDC_ACM_0";
};
};

5
app/boards/arm/nice60/nice60.dts

@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
zephyr,code-partition = &code_partition;
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,console = &cdc_acm_uart;
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,underglow = &led_strip;
@ -128,6 +129,10 @@ RC(4,0) RC(4,1) RC(4,2) RC(4,5) R @@ -128,6 +129,10 @@ RC(4,0) RC(4,1) RC(4,2) RC(4,5) R
&usbd {
status = "okay";
cdc_acm_uart: cdc_acm_uart {
compatible = "zephyr,cdc-acm-uart";
label = "CDC_ACM_0";
};
};
&flash0 {

5
app/boards/arm/nice_nano/nice_nano.dtsi

@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
zephyr,code-partition = &code_partition;
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,console = &cdc_acm_uart;
};
leds {
@ -56,6 +57,10 @@ @@ -56,6 +57,10 @@
&usbd {
status = "okay";
cdc_acm_uart: cdc_acm_uart {
compatible = "zephyr,cdc-acm-uart";
label = "CDC_ACM_0";
};
};

5
app/boards/arm/nrf52840_m2/nrf52840_m2.dts

@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
zephyr,code-partition = &code_partition;
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,console = &cdc_acm_uart;
};
leds {
@ -54,6 +55,10 @@ @@ -54,6 +55,10 @@
&usbd {
compatible = "nordic,nrf-usbd";
status = "okay";
cdc_acm_uart: cdc_acm_uart {
compatible = "zephyr,cdc-acm-uart";
label = "CDC_ACM_0";
};
};

5
app/boards/arm/nrfmicro/nrfmicro_11.dts

@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
zephyr,code-partition = &code_partition;
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,console = &cdc_acm_uart;
};
leds {
@ -59,6 +60,10 @@ @@ -59,6 +60,10 @@
&usbd {
status = "okay";
cdc_acm_uart: cdc_acm_uart {
compatible = "zephyr,cdc-acm-uart";
label = "CDC_ACM_0";
};
};

5
app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts

@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
zephyr,code-partition = &code_partition;
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,console = &cdc_acm_uart;
};
leds {
@ -59,6 +60,10 @@ @@ -59,6 +60,10 @@
&usbd {
status = "okay";
cdc_acm_uart: cdc_acm_uart {
compatible = "zephyr,cdc-acm-uart";
label = "CDC_ACM_0";
};
};

5
app/boards/arm/nrfmicro/nrfmicro_13.dts

@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
zephyr,code-partition = &code_partition;
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,console = &cdc_acm_uart;
};
leds {
@ -71,6 +72,10 @@ @@ -71,6 +72,10 @@
&usbd {
status = "okay";
cdc_acm_uart: cdc_acm_uart {
compatible = "zephyr,cdc-acm-uart";
label = "CDC_ACM_0";
};
};

5
app/boards/arm/planck/planck_rev6.dts

@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
chosen {
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,console = &cdc_acm_uart;
zmk,kscan = &kscan0;
zmk,matrix_transform = &layout_grid_transform;
};
@ -83,6 +84,10 @@ layout_2x2u_transform: @@ -83,6 +84,10 @@ layout_2x2u_transform:
&usb {
status = "okay";
cdc_acm_uart: cdc_acm_uart {
compatible = "zephyr,cdc-acm-uart";
label = "CDC_ACM_0";
};
};
&flash0 {

5
app/boards/arm/s40nc/s40nc.dts

@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
zephyr,code-partition = &code_partition;
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,console = &cdc_acm_uart;
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
};
@ -95,6 +96,10 @@ @@ -95,6 +96,10 @@
&usbd {
status = "okay";
cdc_acm_uart: cdc_acm_uart {
compatible = "zephyr,cdc-acm-uart";
label = "CDC_ACM_0";
};
};
&flash0 {

Loading…
Cancel
Save