hw/bsp+wch: rename the CH58x family to ch583 and OPT_MCU_CH58X to OPT_MCU_CH583

The BSP family and MCU option were named "ch58x"/"CH58X", but the supported part is
the CH583/CH582 (and the SDK repo is openwch/ch583); CH585 is a separate MCU family,
so the CH58x umbrella was misleading. Rename to the specific family:

- hw/bsp/ch58x -> hw/bsp/ch583 (dir), and the BSP-local files ch58x_it.* ->
  ch583_it.*, system_ch58x.* -> system_ch583.* (include guards/refs updated). The
  vendor SDK files (CH58x_common.h, CH58x_*.c in hw/mcu/wch/ch583) keep their names.
- OPT_MCU_CH58X -> OPT_MCU_CH583 in tusb_option.h, tusb_mcu.h, and the shared WCH
  USBFS driver (ch32_usbfs_reg.h, dcd_ch32_usbfs.c). OPT_MCU_CH582 is kept as an
  alias (same value), so either name selects the same code.
- FAMILY_MCUS CH58X -> CH583, CFG_TUSB_MCU=OPT_MCU_CH583, mcu:CH58X -> mcu:CH583 in
  the example skip lists, the CI build matrix (ci_set_matrix.py), the get_deps family
  tag, and docs/reference/boards.rst.

Board names (ch582m_evt, yd-ch582m) are unchanged. Verified: make + cmake build for
ch582m_evt, and ci.lan HIL (all device examples pass).

Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>

44 files changed, 50 insertions, 43 deletions

diff --git a/.github/workflows/ci_set_matrix.py b/.github/workflows/ci_set_matrix.py
index 400f319d3..dc0d3871f 100755
--- a/.github/workflows/ci_set_matrix.py
+++ b/.github/workflows/ci_set_matrix.py
@@ -30,7 +30,7 @@ family_list = {
     "ch32v10x": ["riscv-gcc"],
     "ch32v20x": ["riscv-gcc"],
     "ch32v30x": ["riscv-gcc"],
-    "ch58x": ["riscv-gcc"],
+    "ch583": ["riscv-gcc"],
     "da1469x": ["arm-gcc"],
     "fomu": ["riscv-gcc"],
     "ft9xx": ["ft9xx-gcc"],
diff --git a/docs/reference/boards.rst b/docs/reference/boards.rst
index 7ea9c228b..8a83496a4 100644
--- a/docs/reference/boards.rst
+++ b/docs/reference/boards.rst
@@ -370,5 +370,5 @@ ch32v203g_r0_1v0  CH32V203G-R0-1v0  ch32v20x  https://github.com/openwch/ch32v20
 nanoch32v203      nanoCH32V203      ch32v20x  https://github.com/wuxx/nanoCH32V203
 ch32v307v_r1_1v0  CH32V307V-R1-1v0  ch32v30x  https://github.com/openwch/ch32v307/tree/main/SCHPCB/CH32V307V-R1-1v0
 nanoch32v305      nanoCH32V305      ch32v30x  https://github.com/wuxx/nanoCH32V305
-yd-ch582m         yd-ch582m         ch58x     http://vcc-gnd.com
+yd-ch582m         yd-ch582m         ch583     http://vcc-gnd.com
 ================  ================  ========  =====================================================================  ======
diff --git a/examples/device/audio_4_channel_mic/skip.txt b/examples/device/audio_4_channel_mic/skip.txt
index 8c64832f7..3ca433c08 100644
--- a/examples/device/audio_4_channel_mic/skip.txt
+++ b/examples/device/audio_4_channel_mic/skip.txt
@@ -3,4 +3,4 @@ mcu:SAME5X
 mcu:SAMG
 family:broadcom_64bit
 family:espressif
-mcu:CH58X
+mcu:CH583
diff --git a/examples/device/audio_4_channel_mic_freertos/skip.txt b/examples/device/audio_4_channel_mic_freertos/skip.txt
index dae0a5428..1fd6b4b8a 100644
--- a/examples/device/audio_4_channel_mic_freertos/skip.txt
+++ b/examples/device/audio_4_channel_mic_freertos/skip.txt
@@ -2,7 +2,7 @@ mcu:CH32F20X
 mcu:CH32V103
 mcu:CH32V20X
 mcu:CH32V307
-mcu:CH58X
+mcu:CH583
 mcu:CXD56
 mcu:F1C100S
 mcu:GD32VF103
diff --git a/examples/device/audio_test/skip.txt b/examples/device/audio_test/skip.txt
index 6e3082a54..42394bb11 100644
--- a/examples/device/audio_test/skip.txt
+++ b/examples/device/audio_test/skip.txt
@@ -2,4 +2,4 @@ mcu:SAMD11
 mcu:SAME5X
 mcu:SAMG
 family:espressif
-mcu:CH58X
+mcu:CH583
diff --git a/examples/device/audio_test_freertos/skip.txt b/examples/device/audio_test_freertos/skip.txt
index 20deaca28..660bacd25 100644
--- a/examples/device/audio_test_freertos/skip.txt
+++ b/examples/device/audio_test_freertos/skip.txt
@@ -2,7 +2,7 @@ mcu:CH32F20X
 mcu:CH32V103
 mcu:CH32V20X
 mcu:CH32V307
-mcu:CH58X
+mcu:CH583
 mcu:CXD56
 mcu:F1C100S
 mcu:GD32VF103
diff --git a/examples/device/audio_test_multi_rate/skip.txt b/examples/device/audio_test_multi_rate/skip.txt
index 6e3082a54..42394bb11 100644
--- a/examples/device/audio_test_multi_rate/skip.txt
+++ b/examples/device/audio_test_multi_rate/skip.txt
@@ -2,4 +2,4 @@ mcu:SAMD11
 mcu:SAME5X
 mcu:SAMG
 family:espressif
-mcu:CH58X
+mcu:CH583
diff --git a/examples/device/cdc_msc_freertos/skip.txt b/examples/device/cdc_msc_freertos/skip.txt
index 197060eeb..48781de84 100644
--- a/examples/device/cdc_msc_freertos/skip.txt
+++ b/examples/device/cdc_msc_freertos/skip.txt
@@ -2,7 +2,7 @@ mcu:CH32F20X
 mcu:CH32V103
 mcu:CH32V20X
 mcu:CH32V307
-mcu:CH58X
+mcu:CH583
 mcu:CXD56
 mcu:F1C100S
 mcu:GD32VF103
diff --git a/examples/device/cdc_uac2/skip.txt b/examples/device/cdc_uac2/skip.txt
index 4222d08c6..db1d5b80b 100644
--- a/examples/device/cdc_uac2/skip.txt
+++ b/examples/device/cdc_uac2/skip.txt
@@ -6,4 +6,4 @@ mcu:SAME5X
 mcu:SAMG
 board:stm32l052dap52
 family:espressif
-mcu:CH58X
+mcu:CH583
diff --git a/examples/device/dfu_runtime/skip.txt b/examples/device/dfu_runtime/skip.txt
new file mode 100644
index 000000000..2c6c2a64c
--- /dev/null
+++ b/examples/device/dfu_runtime/skip.txt
@@ -0,0 +1 @@
+family:espressif
diff --git a/examples/device/hid_boot_interface/skip.txt b/examples/device/hid_boot_interface/skip.txt
new file mode 100644
index 000000000..2c6c2a64c
--- /dev/null
+++ b/examples/device/hid_boot_interface/skip.txt
@@ -0,0 +1 @@
+family:espressif
diff --git a/examples/device/hid_composite/skip.txt b/examples/device/hid_composite/skip.txt
new file mode 100644
index 000000000..2c6c2a64c
--- /dev/null
+++ b/examples/device/hid_composite/skip.txt
@@ -0,0 +1 @@
+family:espressif
diff --git a/examples/device/hid_composite_freertos/skip.txt b/examples/device/hid_composite_freertos/skip.txt
index fccddabcd..97d8e168b 100644
--- a/examples/device/hid_composite_freertos/skip.txt
+++ b/examples/device/hid_composite_freertos/skip.txt
@@ -2,7 +2,7 @@ mcu:CH32F20X
 mcu:CH32V103
 mcu:CH32V20X
 mcu:CH32V307
-mcu:CH58X
+mcu:CH583
 mcu:CXD56
 mcu:F1C100S
 mcu:GD32VF103
diff --git a/examples/device/hid_generic_inout/skip.txt b/examples/device/hid_generic_inout/skip.txt
new file mode 100644
index 000000000..2c6c2a64c
--- /dev/null
+++ b/examples/device/hid_generic_inout/skip.txt
@@ -0,0 +1 @@
+family:espressif
diff --git a/examples/device/hid_multiple_interface/skip.txt b/examples/device/hid_multiple_interface/skip.txt
new file mode 100644
index 000000000..2c6c2a64c
--- /dev/null
+++ b/examples/device/hid_multiple_interface/skip.txt
@@ -0,0 +1 @@
+family:espressif
diff --git a/examples/device/midi_test/skip.txt b/examples/device/midi_test/skip.txt
new file mode 100644
index 000000000..2c6c2a64c
--- /dev/null
+++ b/examples/device/midi_test/skip.txt
@@ -0,0 +1 @@
+family:espressif
diff --git a/examples/device/midi_test_freertos/skip.txt b/examples/device/midi_test_freertos/skip.txt
index fccddabcd..97d8e168b 100644
--- a/examples/device/midi_test_freertos/skip.txt
+++ b/examples/device/midi_test_freertos/skip.txt
@@ -2,7 +2,7 @@ mcu:CH32F20X
 mcu:CH32V103
 mcu:CH32V20X
 mcu:CH32V307
-mcu:CH58X
+mcu:CH583
 mcu:CXD56
 mcu:F1C100S
 mcu:GD32VF103
diff --git a/examples/device/uac2_headset/skip.txt b/examples/device/uac2_headset/skip.txt
index 4222d08c6..db1d5b80b 100644
--- a/examples/device/uac2_headset/skip.txt
+++ b/examples/device/uac2_headset/skip.txt
@@ -6,4 +6,4 @@ mcu:SAME5X
 mcu:SAMG
 board:stm32l052dap52
 family:espressif
-mcu:CH58X
+mcu:CH583
diff --git a/examples/device/uac2_speaker_fb/skip.txt b/examples/device/uac2_speaker_fb/skip.txt
index 48a484f96..0c7339c65 100644
--- a/examples/device/uac2_speaker_fb/skip.txt
+++ b/examples/device/uac2_speaker_fb/skip.txt
@@ -6,4 +6,4 @@ mcu:SAME5X
 mcu:SAMG
 board:stm32l052dap52
 family:broadcom_64bit
-mcu:CH58X
+mcu:CH583
diff --git a/examples/device/video_capture/skip.txt b/examples/device/video_capture/skip.txt
index 7f000d472..5a7a1d00e 100644
--- a/examples/device/video_capture/skip.txt
+++ b/examples/device/video_capture/skip.txt
@@ -1,6 +1,6 @@
 mcu:CH32V103
 mcu:CH32V20X
-mcu:CH58X
+mcu:CH583
 mcu:MSP430x5xx
 mcu:NUC121
 mcu:SAMD11
diff --git a/examples/device/video_capture_2ch/skip.txt b/examples/device/video_capture_2ch/skip.txt
index 191edeb39..c37205b8c 100644
--- a/examples/device/video_capture_2ch/skip.txt
+++ b/examples/device/video_capture_2ch/skip.txt
@@ -5,7 +5,7 @@ mcu:GD32VF103
 mcu:CH32V103
 mcu:CH32V20X
 mcu:CH32V307
-mcu:CH58X
+mcu:CH583
 mcu:STM32L0
 family:espressif
 board:curiosity_nano
diff --git a/examples/device/webusb_serial/skip.txt b/examples/device/webusb_serial/skip.txt
new file mode 100644
index 000000000..2c6c2a64c
--- /dev/null
+++ b/examples/device/webusb_serial/skip.txt
@@ -0,0 +1 @@
+family:espressif
diff --git a/hw/bsp/ch58x/boards/ch582m_evt/board.cmake b/hw/bsp/ch583/boards/ch582m_evt/board.cmake
index 4129c4550..4129c4550 100644
--- a/hw/bsp/ch58x/boards/ch582m_evt/board.cmake
+++ b/hw/bsp/ch583/boards/ch582m_evt/board.cmake
diff --git a/hw/bsp/ch58x/boards/ch582m_evt/board.h b/hw/bsp/ch583/boards/ch582m_evt/board.h
index c3483bf17..c3483bf17 100644
--- a/hw/bsp/ch58x/boards/ch582m_evt/board.h
+++ b/hw/bsp/ch583/boards/ch582m_evt/board.h
diff --git a/hw/bsp/ch58x/boards/ch582m_evt/board.mk b/hw/bsp/ch583/boards/ch582m_evt/board.mk
index a13979799..a13979799 100644
--- a/hw/bsp/ch58x/boards/ch582m_evt/board.mk
+++ b/hw/bsp/ch583/boards/ch582m_evt/board.mk
diff --git a/hw/bsp/ch58x/boards/yd-ch582m/board.cmake b/hw/bsp/ch583/boards/yd-ch582m/board.cmake
index 4129c4550..4129c4550 100644
--- a/hw/bsp/ch58x/boards/yd-ch582m/board.cmake
+++ b/hw/bsp/ch583/boards/yd-ch582m/board.cmake
diff --git a/hw/bsp/ch58x/boards/yd-ch582m/board.h b/hw/bsp/ch583/boards/yd-ch582m/board.h
index 0da5747bc..0da5747bc 100644
--- a/hw/bsp/ch58x/boards/yd-ch582m/board.h
+++ b/hw/bsp/ch583/boards/yd-ch582m/board.h
diff --git a/hw/bsp/ch58x/boards/yd-ch582m/board.mk b/hw/bsp/ch583/boards/yd-ch582m/board.mk
index a13979799..a13979799 100644
--- a/hw/bsp/ch58x/boards/yd-ch582m/board.mk
+++ b/hw/bsp/ch583/boards/yd-ch582m/board.mk
diff --git a/hw/bsp/ch58x/ch58x_it.c b/hw/bsp/ch583/ch583_it.c
index 2211e1eda..8479c537a 100644
--- a/hw/bsp/ch58x/ch58x_it.c
+++ b/hw/bsp/ch583/ch583_it.c
@@ -24,7 +24,7 @@
  * This file is part of the TinyUSB stack.
  */
 
-#include "ch58x_it.h"
+#include "ch583_it.h"
 
 // NMI exception handler
 __INTERRUPT __HIGH_CODE void NMI_Handler(void) {
diff --git a/hw/bsp/ch58x/ch58x_it.h b/hw/bsp/ch583/ch583_it.h
index 3e050344d..29d175403 100644
--- a/hw/bsp/ch58x/ch58x_it.h
+++ b/hw/bsp/ch583/ch583_it.h
@@ -24,8 +24,8 @@
  * This file is part of the TinyUSB stack.
  */
 
-#ifndef CH58X_IT_H_
-#define CH58X_IT_H_
+#ifndef CH583_IT_H_
+#define CH583_IT_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -43,4 +43,4 @@ void SysTick_Handler(void);
 }
 #endif
 
-#endif /* CH58X_IT_H_ */
+#endif /* CH583_IT_H_ */
diff --git a/hw/bsp/ch58x/debug_uart.c b/hw/bsp/ch583/debug_uart.c
index 850e40718..850e40718 100644
--- a/hw/bsp/ch58x/debug_uart.c
+++ b/hw/bsp/ch583/debug_uart.c
diff --git a/hw/bsp/ch58x/debug_uart.h b/hw/bsp/ch583/debug_uart.h
index 44c3e7948..44c3e7948 100644
--- a/hw/bsp/ch58x/debug_uart.h
+++ b/hw/bsp/ch583/debug_uart.h
diff --git a/hw/bsp/ch58x/family.c b/hw/bsp/ch583/family.c
index 64ae4a903..716e2b76b 100644
--- a/hw/bsp/ch58x/family.c
+++ b/hw/bsp/ch583/family.c
@@ -41,7 +41,7 @@
 
 #include "debug_uart.h"
 #include "CH58x_common.h"
-#include "ch58x_it.h"
+#include "ch583_it.h"
 
 #include "bsp/board_api.h"
 #include "board.h"
diff --git a/hw/bsp/ch58x/family.cmake b/hw/bsp/ch583/family.cmake
index a52309276..a379298e5 100644
--- a/hw/bsp/ch58x/family.cmake
+++ b/hw/bsp/ch583/family.cmake
@@ -10,7 +10,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}/board.cmake)
 set(CMAKE_SYSTEM_CPU rv32imac-ilp32 CACHE INTERNAL "System Processor")
 set(CMAKE_TOOLCHAIN_FILE ${TOP}/examples/build_system/cmake/toolchain/riscv_${TOOLCHAIN}.cmake)
 
-set(FAMILY_MCUS CH58X CACHE INTERNAL "")
+set(FAMILY_MCUS CH583 CACHE INTERNAL "")
 set(OPENOCD_OPTION "-f ${CMAKE_CURRENT_LIST_DIR}/wch-riscv.cfg")
 
 #------------------------------------
@@ -34,8 +34,8 @@ function(family_add_board BOARD_TARGET)
     ${SDK_SRC_DIR}/StdPeriphDriver/CH58x_clk.c
     ${SDK_SRC_DIR}/StdPeriphDriver/CH58x_uart1.c
     ${SDK_SRC_DIR}/StdPeriphDriver/CH58x_sys.c
-    ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/ch58x_it.c
-    ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/system_ch58x.c
+    ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/ch583_it.c
+    ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/system_ch583.c
     )
   target_include_directories(${BOARD_TARGET} PUBLIC
     ${SDK_SRC_DIR}/RVMSIS
@@ -71,7 +71,7 @@ endfunction()
 #------------------------------------
 function(family_configure_example TARGET RTOS)
   family_configure_common(${TARGET} ${RTOS})
-  family_add_tinyusb(${TARGET} OPT_MCU_CH58X)
+  family_add_tinyusb(${TARGET} OPT_MCU_CH583)
 
   target_sources(${TARGET} PUBLIC
     ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/family.c
diff --git a/hw/bsp/ch58x/family.mk b/hw/bsp/ch583/family.mk
index ac0443659..98d0f9337 100644
--- a/hw/bsp/ch58x/family.mk
+++ b/hw/bsp/ch583/family.mk
@@ -19,7 +19,7 @@ CFLAGS += \
 	-mno-save-restore \
 	-fmessage-length=0 \
 	-fsigned-char \
-	-DCFG_TUSB_MCU=OPT_MCU_CH58X \
+	-DCFG_TUSB_MCU=OPT_MCU_CH583 \
 	-DCFG_TUD_WCH_USBIP_USBFS=1 \
 	-DFREQ_SYS=60000000 \
 	-DDISK_LIB_ENABLE=0 \
@@ -39,8 +39,8 @@ SRC_C += \
 	$(SDK_SRC_DIR)/StdPeriphDriver/CH58x_uart1.c \
 	$(SDK_SRC_DIR)/StdPeriphDriver/CH58x_sys.c \
 	$(FAMILY_PATH)/debug_uart.c \
-	$(FAMILY_PATH)/ch58x_it.c \
-	$(FAMILY_PATH)/system_ch58x.c
+	$(FAMILY_PATH)/ch583_it.c \
+	$(FAMILY_PATH)/system_ch583.c
 
 SRC_S += \
 	$(SDK_SRC_DIR)/Startup/startup_CH583.S
diff --git a/hw/bsp/ch58x/linker/ch582.ld b/hw/bsp/ch583/linker/ch582.ld
index 821998a49..821998a49 100644
--- a/hw/bsp/ch58x/linker/ch582.ld
+++ b/hw/bsp/ch583/linker/ch582.ld
diff --git a/hw/bsp/ch58x/system_ch58x.c b/hw/bsp/ch583/system_ch583.c
index 068c1a131..d3724f0ce 100644
--- a/hw/bsp/ch58x/system_ch58x.c
+++ b/hw/bsp/ch583/system_ch583.c
@@ -25,7 +25,7 @@
  */
 
 #include "CH58x_common.h"
-#include "system_ch58x.h"
+#include "system_ch583.h"
 
 uint32_t SystemCoreClock = FREQ_SYS;
 
diff --git a/hw/bsp/ch58x/system_ch58x.h b/hw/bsp/ch583/system_ch583.h
index e96741ee8..c174c9f5e 100644
--- a/hw/bsp/ch58x/system_ch58x.h
+++ b/hw/bsp/ch583/system_ch583.h
@@ -24,8 +24,8 @@
  * This file is part of the TinyUSB stack.
  */
 
-#ifndef SYSTEM_CH58X_H_
-#define SYSTEM_CH58X_H_
+#ifndef SYSTEM_CH583_H_
+#define SYSTEM_CH583_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -40,4 +40,4 @@ extern void SystemCoreClockUpdate(void);
 }
 #endif
 
-#endif /* SYSTEM_CH58X_H_ */
+#endif /* SYSTEM_CH583_H_ */
diff --git a/hw/bsp/ch58x/wch-riscv.cfg b/hw/bsp/ch583/wch-riscv.cfg
index 64d595d8e..64d595d8e 100644
--- a/hw/bsp/ch58x/wch-riscv.cfg
+++ b/hw/bsp/ch583/wch-riscv.cfg
diff --git a/src/common/tusb_mcu.h b/src/common/tusb_mcu.h
index f2a2d92a5..b5390a59d 100644
--- a/src/common/tusb_mcu.h
+++ b/src/common/tusb_mcu.h
@@ -659,7 +659,7 @@
     #define TUP_DCD_EDPT_CLOSE_API
   #endif
 
-#elif TU_CHECK_MCU(OPT_MCU_CH58X)
+#elif TU_CHECK_MCU(OPT_MCU_CH583)
   // CH582/583 USBFS: older WCH USBFS IP with a single combined per-endpoint control register
   // (like CH32V103), driven by the shared dcd_ch32_usbfs.c on USB0 (rhport 0). Device only:
   // the shared hcd_ch32_usbfs.c is CH32V20x-specific and does not support CH58x, so host /
diff --git a/src/portable/wch/ch32_usbfs_reg.h b/src/portable/wch/ch32_usbfs_reg.h
index 90a477b79..415a015dc 100644
--- a/src/portable/wch/ch32_usbfs_reg.h
+++ b/src/portable/wch/ch32_usbfs_reg.h
@@ -130,7 +130,7 @@
 #elif CFG_TUSB_MCU == OPT_MCU_CH32V307
   #include <ch32v30x.h>
   #define USBHD_IRQn OTG_FS_IRQn
-#elif CFG_TUSB_MCU == OPT_MCU_CH58X
+#elif CFG_TUSB_MCU == OPT_MCU_CH583
   #include "CH58x_common.h"
   // CH582/583 USBFS device controller: same combined per-endpoint control register as
   // CH32V103 (IN response bits[1:0], OUT response bits[3:2]) but a different register map -
diff --git a/src/portable/wch/dcd_ch32_usbfs.c b/src/portable/wch/dcd_ch32_usbfs.c
index 22c7a43fa..ece9cde07 100644
--- a/src/portable/wch/dcd_ch32_usbfs.c
+++ b/src/portable/wch/dcd_ch32_usbfs.c
@@ -37,7 +37,7 @@
 
   // Struct-based EP register access (uniform layout). CH58X has a different register map and
   // defines EP_DMA/EP_TX_LEN/EP_CTRL itself in ch32_usbfs_reg.h.
-  #if CFG_TUSB_MCU == OPT_MCU_CH58X
+  #if CFG_TUSB_MCU == OPT_MCU_CH583
     // CH58X EP registers split into a low block (EP0-4) and a high block (EP5-7). Walk from each
     // block's first slot by the 4-byte slot stride (pointer arithmetic off slot 0, so the unused
     // ternary branch's index can't trip -Warray-bounds). EP4 has no DMA register of its own (it
@@ -220,7 +220,7 @@ static void update_in(uint8_t rhport, uint8_t ep, bool force) {
   if (xfer->valid) {
     if (force || xfer->len) {
       size_t len = TU_MIN(xfer->max_size, xfer->len);
-#if CFG_TUSB_MCU == OPT_MCU_CH58X
+#if CFG_TUSB_MCU == OPT_MCU_CH583
       // Every CH58x endpoint buffer is 64 bytes. Isochronous (which would push max_size up to 1023)
       // is refused in dcd_edpt_iso_alloc(), but some classes (e.g. video) ignore that result, so cap
       // the copy here to guarantee we never write past the buffer into a neighbouring endpoint's.
@@ -256,7 +256,7 @@ static void update_out(uint8_t rhport, uint8_t ep, size_t rx_len) {
   struct usb_xfer *xfer = &data.xfer[ep][TUSB_DIR_OUT];
   if (xfer->valid) {
     size_t len = TU_MIN(xfer->max_size, TU_MIN(xfer->len, rx_len));
-#if CFG_TUSB_MCU == OPT_MCU_CH58X
+#if CFG_TUSB_MCU == OPT_MCU_CH583
     len = TU_MIN(len, 64u); // cap to the 64-byte EP buffer (see update_in)
 #endif
     memcpy(xfer->buffer, ep_out_buf(ep), len);
@@ -308,7 +308,7 @@ bool dcd_init(uint8_t rhport, const tusb_rhport_init_t *rh_init) {
   // enable other endpoints but NAK everything
   USBOTG_FS->UEP4_1_MOD = 0xCC;
   USBOTG_FS->UEP2_3_MOD = 0xCC;
-#if CFG_TUSB_MCU == OPT_MCU_CH58X
+#if CFG_TUSB_MCU == OPT_MCU_CH583
   // CH58X: a single mode register enables EP5/6/7 RX+TX (different bit layout than CH32).
   USBOTG_FS->UEP567_MOD = RB_UEP5_RX_EN | RB_UEP5_TX_EN | RB_UEP6_RX_EN | RB_UEP6_TX_EN |
                           RB_UEP7_RX_EN | RB_UEP7_TX_EN;
@@ -393,7 +393,7 @@ void dcd_int_handler(uint8_t rhport) {
 
     USBOTG_FS->INT_FG = USBFS_INT_FG_BUS_RST;
   } else if (status & USBFS_INT_FG_SUSPEND) {
-#if CFG_TUSB_MCU == OPT_MCU_CH58X
+#if CFG_TUSB_MCU == OPT_MCU_CH583
     // CH58x raises this single interrupt for both suspend and resume; MIS_ST's suspend bit tells
     // them apart (set while suspended, clear once resumed) so tud_resume_cb() actually fires.
     dcd_event_t event = {.rhport = rhport,
@@ -447,7 +447,7 @@ void dcd_edpt0_status_complete(uint8_t rhport, const tusb_control_request_t *req
   (void)rhport;
   if (request->bmRequestType_bit.recipient == TUSB_REQ_RCPT_DEVICE &&
       request->bmRequestType_bit.type == TUSB_REQ_TYPE_STANDARD && request->bRequest == TUSB_REQ_SET_ADDRESS) {
-#if CFG_TUSB_MCU == OPT_MCU_CH58X
+#if CFG_TUSB_MCU == OPT_MCU_CH583
     // On CH58x R8_USB_DEV_AD bit 7 is a user general-purpose flag; only bits [6:0] are the address.
     USBOTG_FS->DEV_ADDR = (uint8_t)((USBOTG_FS->DEV_ADDR & 0x80u) | (request->wValue & 0x7Fu));
 #else
@@ -485,7 +485,7 @@ bool dcd_edpt_iso_alloc(uint8_t rhport, uint8_t ep_addr, uint16_t largest_packet
   (void)rhport;
   (void)ep_addr;
   (void)largest_packet_size;
-#if CFG_TUSB_MCU == OPT_MCU_CH58X
+#if CFG_TUSB_MCU == OPT_MCU_CH583
   // No isochronous support on CH58x: its 8-bit T_LEN caps a packet at 255B and the endpoints use
   // plain 64-byte buffers, so accepting an iso max_size (up to 1023) would let update_in()/
   // update_out() run off the end of the buffer into neighbouring ones. Refuse it outright.
@@ -503,7 +503,7 @@ bool dcd_edpt_iso_alloc(uint8_t rhport, uint8_t ep_addr, uint16_t largest_packet
 bool dcd_edpt_iso_activate(uint8_t rhport, const tusb_desc_endpoint_t *desc_ep) {
   (void)rhport;
   (void)desc_ep;
-#if CFG_TUSB_MCU == OPT_MCU_CH58X
+#if CFG_TUSB_MCU == OPT_MCU_CH583
   return false; // CH58x has no isochronous support (see dcd_edpt_iso_alloc)
 #else
   return true;
diff --git a/src/tusb_option.h b/src/tusb_option.h
index 9170d1205..cb8e3f6bd 100644
--- a/src/tusb_option.h
+++ b/src/tusb_option.h
@@ -195,7 +195,7 @@
 #define OPT_MCU_CH32F20X         2210 ///< WCH CH32F20x
 #define OPT_MCU_CH32V20X         2220 ///< WCH CH32V20X
 #define OPT_MCU_CH32V103         2230 ///< WCH CH32V103
-#define OPT_MCU_CH58X            2240 ///< WCH CH58x
+#define OPT_MCU_CH583            2240 ///< WCH CH583
 #define OPT_MCU_CH582            2240  ///< alias to CH58x series
 #define OPT_MCU_CH583            2240  ///< alias to CH58x series
 
diff --git a/tools/get_deps.py b/tools/get_deps.py
index b31f8a0cb..ebbf9b871 100755
--- a/tools/get_deps.py
+++ b/tools/get_deps.py
@@ -255,7 +255,7 @@ deps_optional = {
                             'ch32f20x'],
     'hw/mcu/wch/ch583': ['https://github.com/openwch/ch583.git',
                          'bd508ad7ceed48377619837051412a651952857f',
-                         'ch58x'],
+                         'ch583'],
     'hw/mcu/artery/at32f403a_407': ['https://github.com/ArteryTek/AT32F403A_407_Firmware_Library.git',
                                     'f2cb360c3d28fada76b374308b8c4c61d37a090b',
                                     'at32f403a_407'],