zephyrproject-rtos · miggazElquez · May 15, 2025 · May 27, 2025
diff --git a/soc/wch/ch32v/ch32v00x/CMakeLists.txt b/soc/wch/ch32v/ch32v00x/CMakeLists.txt
@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 zephyr_sources(
-  soc_irq.S
-  vector.S
+  ../common/soc_irq.S
+  ../common/qingke_v2x/vector.S
 )
 
 zephyr_include_directories(.)
diff --git a/soc/wch/ch32v/ch32v00x/soc_irq.S b/soc/wch/ch32v/ch32v00x/soc_irq.S
diff --git a/soc/wch/ch32v/ch32v00x/vector.S → soc/wch/ch32v/common/qingke_v2x/vector.S b/soc/wch/ch32v/ch32v00x/vector.S → soc/wch/ch32v/common/qingke_v2x/vector.S
diff --git a/soc/wch/ch32v/qingke_v4c/vector.S → soc/wch/ch32v/common/qingke_v4/vector.S b/soc/wch/ch32v/qingke_v4c/vector.S → soc/wch/ch32v/common/qingke_v4/vector.S
diff --git a/soc/wch/ch32v/qingke_v2a/soc_irq.S → soc/wch/ch32v/common/soc_irq.S b/soc/wch/ch32v/qingke_v2a/soc_irq.S → soc/wch/ch32v/common/soc_irq.S
diff --git a/soc/wch/ch32v/qingke_v2a/CMakeLists.txt b/soc/wch/ch32v/qingke_v2a/CMakeLists.txt
@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 zephyr_sources(
-  soc_irq.S
-  vector.S
+  ../common/soc_irq.S
+  ../common/qingke_v2x/vector.S
 )
 
 zephyr_include_directories(.)
diff --git a/soc/wch/ch32v/qingke_v2a/vector.S b/soc/wch/ch32v/qingke_v2a/vector.S
diff --git a/soc/wch/ch32v/qingke_v4b/CMakeLists.txt b/soc/wch/ch32v/qingke_v4b/CMakeLists.txt
@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 zephyr_sources(
-  soc_irq.S
-  vector.S
+  ../common/soc_irq.S
+  ../common/qingke_v4/vector.S
 )
 
 zephyr_include_directories(.)
diff --git a/soc/wch/ch32v/qingke_v4b/soc_irq.S b/soc/wch/ch32v/qingke_v4b/soc_irq.S
diff --git a/soc/wch/ch32v/qingke_v4b/vector.S b/soc/wch/ch32v/qingke_v4b/vector.S
diff --git a/soc/wch/ch32v/qingke_v4c/CMakeLists.txt b/soc/wch/ch32v/qingke_v4c/CMakeLists.txt
@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 zephyr_sources(
-  soc_irq.S
-  vector.S
+  ../common/soc_irq.S
+  ../common/qingke_v4/vector.S
 )
 
 zephyr_include_directories(.)
diff --git a/soc/wch/ch32v/qingke_v4c/soc_irq.S b/soc/wch/ch32v/qingke_v4c/soc_irq.S
diff --git a/soc/wch/ch32v/qingke_v4f/CMakeLists.txt b/soc/wch/ch32v/qingke_v4f/CMakeLists.txt
@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 zephyr_sources(
-  soc_irq.S
-  vector.S
+  ../common/soc_irq.S
+  ../common/qingke_v4/vector.S
 )
 
 zephyr_include_directories(.)
diff --git a/soc/wch/ch32v/qingke_v4f/pinctrl_soc.h b/soc/wch/ch32v/qingke_v4f/pinctrl_soc.h
@@ -10,7 +10,7 @@
 /**
  * @brief Type to hold a pin's pinctrl configuration.
  */
-struct ch32v303_pinctrl_soc_pin {
+struct ch32v30x_pinctrl_soc_pin {
 	uint32_t config: 22;
 	bool bias_pull_up: 1;
 	bool bias_pull_down: 1;
@@ -21,7 +21,7 @@ struct ch32v303_pinctrl_soc_pin {
 	uint8_t slew_rate: 2;
 };
 
-typedef struct ch32v303_pinctrl_soc_pin pinctrl_soc_pin_t;
+typedef struct ch32v30x_pinctrl_soc_pin pinctrl_soc_pin_t;
 
 #define Z_PINCTRL_STATE_PIN_INIT(node_id, prop, idx)                                               \
 	{                                                                                          \

diff --git a/soc/wch/ch32v/qingke_v4f/soc_irq.S b/soc/wch/ch32v/qingke_v4f/soc_irq.S
diff --git a/soc/wch/ch32v/qingke_v4f/vector.S b/soc/wch/ch32v/qingke_v4f/vector.S