soc: wch: move from qingke-v2 to the more specific qingke-v2a

nzmichaelh · kartben · commit 1d7a095779b1 · 2025-04-26T10:55:45.000+02:00
The CH32V003 CPU is a QingKe V2A while others in the CH32V00x series
use the QingKe V2C. Prepare for adding support for the CH32V006 moving
to the more specifc qingke-v2a, moving some cases of SOC_CH32V003
actually meaning SOC_FAMILY_QINGKE_V2A.

Signed-off-by: Michael Hope &lt;michaelh@juju.nz&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_CH32V003 || SOC_SERIES_QINGKE_V4C
+	depends on SOC_SERIES_QINGKE_V2A || SOC_SERIES_QINGKE_V4C
 	default y
 	depends on DT_HAS_WCH_SYSTICK_ENABLED
diff --git a/dts/riscv/wch/ch32v0/ch32v003.dtsi b/dts/riscv/wch/ch32v0/ch32v003.dtsi
@@ -7,7 +7,7 @@
 
 #include <freq.h>
 #include <mem.h>
-#include <wch/qingke-v2.dtsi>
+#include <wch/qingke-v2a.dtsi>
 #include <zephyr/dt-bindings/gpio/gpio.h>
 #include <zephyr/dt-bindings/i2c/i2c.h>
 #include <zephyr/dt-bindings/clock/ch32v00x-clocks.h>
diff --git a/dts/riscv/wch/qingke-v2a.dtsi b/dts/riscv/wch/qingke-v2a.dtsi
diff --git a/modules/hal_wch/CMakeLists.txt b/modules/hal_wch/CMakeLists.txt
@@ -1,3 +1,3 @@
-if(CONFIG_SOC_CH32V003 OR CONFIG_SOC_SERIES_QINGKE_V4C)
+if(CONFIG_SOC_SERIES_QINGKE_V2A OR CONFIG_SOC_SERIES_QINGKE_V4C)
   zephyr_include_directories(${ZEPHYR_HAL_WCH_MODULE_DIR}/ch32v003fun .)
 endif()
diff --git a/soc/wch/ch32v/soc.yml b/soc/wch/ch32v/soc.yml
@@ -4,7 +4,7 @@
 family:
 - name: ch32v
   series:
-  - name: qingke-v2
+  - name: qingke-v2a
     socs:
     - name: ch32v003
   - name: qingke-v4c
