soc: wch: Reorganize Qingke V4 Socs for future

VynDragon · VynDragon · commit 145559b63246 · 2025-05-04T17:38:59.000+02:00
Reorganization for deduplication.

Signed-off-by: Camille BAUD &lt;mail@massdriver.space&gt;
diff --git a/drivers/timer/Kconfig.wch_ch32v00x b/drivers/timer/Kconfig.wch_ch32v00x
@@ -3,6 +3,6 @@
 
 config CH32V00X_SYSTICK
 	bool "CH32V00X systick timer"
-	depends on SOC_SERIES_QINGKE_V2A || SOC_SERIES_QINGKE_V4C
+	depends on SOC_SERIES_QINGKE_V2A || SOC_SERIES_QINGKE_V4
 	default y
 	depends on DT_HAS_WCH_SYSTICK_ENABLED
diff --git a/modules/hal_wch/CMakeLists.txt b/modules/hal_wch/CMakeLists.txt
@@ -1,3 +1,3 @@
-if(CONFIG_SOC_SERIES_QINGKE_V2A OR CONFIG_SOC_SERIES_QINGKE_V4C)
+if(CONFIG_SOC_FAMILY_CH32V)
   zephyr_include_directories(${ZEPHYR_HAL_WCH_MODULE_DIR}/ch32v003fun .)
 endif()
diff --git a/modules/hal_wch/ch32fun.h b/modules/hal_wch/ch32fun.h
@@ -12,8 +12,9 @@
 #include <ch32v003fun.h>
 #endif
 
-#if defined(CONFIG_SOC_SERIES_QINGKE_V4C)
+#if defined(CONFIG_SOC_CH32V208)
 #define CH32V20x 1
+#define CH32V20x_D8W 1
 #include <ch32v003fun.h>
 #endif
 
diff --git a/soc/wch/ch32v/qingke_v4/CMakeLists.txt b/soc/wch/ch32v/qingke_v4/CMakeLists.txt
@@ -1,5 +1,4 @@
-# Copyright (c) 2024 Michael Hope
-# Copyright (c) 2024 Jianxiong Gu
+# Copyright (c) 2025 MASSDRIVER EI
 # SPDX-License-Identifier: Apache-2.0
 
 zephyr_sources(
diff --git a/soc/wch/ch32v/qingke_v4/Kconfig b/soc/wch/ch32v/qingke_v4/Kconfig
@@ -0,0 +1,4 @@
+# Copyright (c) 2025 MASSDRIVER EI (massdriver.space)
+# SPDX-License-Identifier: Apache-2.0
+
+rsource "*/Kconfig"
diff --git a/soc/wch/ch32v/qingke_v4/Kconfig.defconfig b/soc/wch/ch32v/qingke_v4/Kconfig.defconfig
@@ -1,7 +1,7 @@
 # Copyright (c) 2025 MASSDRIVER EI (massdriver.space)
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_SERIES_QINGKE_V4C
+if SOC_SERIES_QINGKE_V4
 
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default $(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency)
@@ -18,6 +18,6 @@ config ISR_STACK_SIZE
 config CLOCK_CONTROL
 	default y
 
-rsource "Kconfig.defconfig.*"
+rsource "*/Kconfig.defconfig.*"
 
-endif # SOC_SERIES_QINGKE_V4C
+endif # SOC_SERIES_QINGKE_V4
diff --git a/soc/wch/ch32v/qingke_v4/Kconfig.soc b/soc/wch/ch32v/qingke_v4/Kconfig.soc
@@ -1,11 +1,11 @@
 # Copyright (c) 2025 MASSDRIVER EI (massdriver.space)
 # SPDX-License-Identifier: Apache-2.0
 
-config SOC_SERIES_QINGKE_V4C
+config SOC_SERIES_QINGKE_V4
 	bool
 	select SOC_FAMILY_CH32V
 
 config SOC_SERIES
-	default "qingke_v4c" if SOC_SERIES_QINGKE_V4C
+	default "qingke_v4" if SOC_SERIES_QINGKE_V4
 
-rsource "Kconfig.soc.*"
+rsource "*/Kconfig.soc.*"
diff --git a/soc/wch/ch32v/qingke_v4/pinctrl_soc.h b/soc/wch/ch32v/qingke_v4/pinctrl_soc.h
@@ -10,7 +10,7 @@
 /**
  * @brief Type to hold a pin's pinctrl configuration.
  */
-struct ch32v208_pinctrl_soc_pin {
+struct qingke_v4_pinctrl_soc_pin {
 	uint32_t config: 22;
 	bool bias_pull_up: 1;
 	bool bias_pull_down: 1;
@@ -21,7 +21,7 @@ struct ch32v208_pinctrl_soc_pin {
 	uint8_t slew_rate: 2;
 };
 
-typedef struct ch32v208_pinctrl_soc_pin pinctrl_soc_pin_t;
+typedef struct qingke_v4_pinctrl_soc_pin pinctrl_soc_pin_t;
 
 #define Z_PINCTRL_STATE_PIN_INIT(node_id, prop, idx)                                               \
 	{                                                                                          \
diff --git a/soc/wch/ch32v/qingke_v4/qingke_v4c/Kconfig b/soc/wch/ch32v/qingke_v4/qingke_v4c/Kconfig
@@ -1,7 +1,7 @@
 # Copyright (c) 2025 MASSDRIVER EI (massdriver.space)
 # SPDX-License-Identifier: Apache-2.0
 
-config SOC_SERIES_QINGKE_V4C
+config SOC_CH32V208
 	select RISCV_ISA_RV32I
 	select RISCV_ISA_EXT_M
 	select RISCV_ISA_EXT_A
diff --git a/soc/wch/ch32v/qingke_v4/qingke_v4c/Kconfig.defconfig.ch32v208 b/soc/wch/ch32v/qingke_v4/qingke_v4c/Kconfig.defconfig.ch32v208
diff --git a/soc/wch/ch32v/qingke_v4/qingke_v4c/Kconfig.soc.ch32v208 b/soc/wch/ch32v/qingke_v4/qingke_v4c/Kconfig.soc.ch32v208
@@ -3,7 +3,7 @@
 
 config SOC_CH32V208
 	bool
-	select SOC_SERIES_QINGKE_V4C
+	select SOC_SERIES_QINGKE_V4
 
 config SOC
 	default "ch32v208" if SOC_CH32V208
diff --git a/soc/wch/ch32v/qingke_v4/soc_irq.S b/soc/wch/ch32v/qingke_v4/soc_irq.S
diff --git a/soc/wch/ch32v/qingke_v4/vector.S b/soc/wch/ch32v/qingke_v4/vector.S
diff --git a/soc/wch/ch32v/soc.yml b/soc/wch/ch32v/soc.yml
@@ -7,6 +7,6 @@ family:
   - name: qingke-v2a
     socs:
     - name: ch32v003
-  - name: qingke-v4c
+  - name: qingke-v4
     socs:
     - name: ch32v208
