From 2b91c467f290b14512bad46afe6f428f58253e42 Mon Sep 17 00:00:00 2001
From: Miguel Gazquez <miguel.gazquez@bootlin.com>
Date: Mon, 10 Mar 2025 16:28:35 +0100
Subject: [PATCH] modules: Update hal_wch

Update hal_wch.

As the hal upstream changed name, there is now a name conflict.
Rename ch32fun.h to hal_ch32fun.h to fix this conflict.

Signed-off-by: Miguel Gazquez <miguel.gazquez@bootlin.com>
---
 drivers/clock_control/clock_control_wch_rcc.c | 2 +-
 drivers/gpio/wch_gpio_ch32v00x.c              | 2 +-
 drivers/interrupt_controller/intc_wch_pfic.c  | 2 +-
 drivers/pinctrl/pinctrl_wch_20x_30x_afio.c    | 2 +-
 drivers/pinctrl/pinctrl_wch_afio.c            | 2 +-
 drivers/serial/uart_wch_usart.c               | 2 +-
 drivers/timer/wch_systick_ch32v00x.c          | 2 +-
 modules/hal_wch/CMakeLists.txt                | 2 +-
 modules/hal_wch/{ch32fun.h => hal_ch32fun.h}  | 8 ++++----
 west.yml                                      | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)
 rename modules/hal_wch/{ch32fun.h => hal_ch32fun.h} (79%)

diff --git a/drivers/clock_control/clock_control_wch_rcc.c b/drivers/clock_control/clock_control_wch_rcc.c
index 14722d9ede4..82a051d0d56 100644
--- a/drivers/clock_control/clock_control_wch_rcc.c
+++ b/drivers/clock_control/clock_control_wch_rcc.c
@@ -14,7 +14,7 @@
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/sys/util_macro.h>
 
-#include <ch32fun.h>
+#include <hal_ch32fun.h>
 
 #define WCH_RCC_CLOCK_ID_OFFSET(id) (((id) >> 5) & 0xFF)
 #define WCH_RCC_CLOCK_ID_BIT(id)    ((id) & 0x1F)
diff --git a/drivers/gpio/wch_gpio_ch32v00x.c b/drivers/gpio/wch_gpio_ch32v00x.c
index c8d3d4954a8..9c259f80628 100644
--- a/drivers/gpio/wch_gpio_ch32v00x.c
+++ b/drivers/gpio/wch_gpio_ch32v00x.c
@@ -10,7 +10,7 @@
 #include <zephyr/dt-bindings/gpio/gpio.h>
 #include <zephyr/irq.h>
 
-#include <ch32fun.h>
+#include <hal_ch32fun.h>
 
 #define DT_DRV_COMPAT wch_gpio
 
diff --git a/drivers/interrupt_controller/intc_wch_pfic.c b/drivers/interrupt_controller/intc_wch_pfic.c
index 2eb71461c10..8626b28e178 100644
--- a/drivers/interrupt_controller/intc_wch_pfic.c
+++ b/drivers/interrupt_controller/intc_wch_pfic.c
@@ -6,7 +6,7 @@
 
 #define DT_DRV_COMPAT wch_pfic
 
-#include <ch32fun.h>
+#include <hal_ch32fun.h>
 
 #include <zephyr/arch/cpu.h>
 #include <zephyr/init.h>
diff --git a/drivers/pinctrl/pinctrl_wch_20x_30x_afio.c b/drivers/pinctrl/pinctrl_wch_20x_30x_afio.c
index b72d9aaf010..367d0019b91 100644
--- a/drivers/pinctrl/pinctrl_wch_20x_30x_afio.c
+++ b/drivers/pinctrl/pinctrl_wch_20x_30x_afio.c
@@ -10,7 +10,7 @@
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/dt-bindings/pinctrl/ch32v20x_30x-pinctrl.h>
 
-#include <ch32fun.h>
+#include <hal_ch32fun.h>
 
 static GPIO_TypeDef *const wch_afio_pinctrl_regs[] = {
 	(GPIO_TypeDef *)DT_REG_ADDR(DT_NODELABEL(gpioa)),
diff --git a/drivers/pinctrl/pinctrl_wch_afio.c b/drivers/pinctrl/pinctrl_wch_afio.c
index a89e37a418c..c6d2dc93ec0 100644
--- a/drivers/pinctrl/pinctrl_wch_afio.c
+++ b/drivers/pinctrl/pinctrl_wch_afio.c
@@ -10,7 +10,7 @@
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/dt-bindings/pinctrl/ch32v003-pinctrl.h>
 
-#include <ch32fun.h>
+#include <hal_ch32fun.h>
 
 static GPIO_TypeDef *const wch_afio_pinctrl_regs[] = {
 	(GPIO_TypeDef *)DT_REG_ADDR(DT_NODELABEL(gpioa)),
diff --git a/drivers/serial/uart_wch_usart.c b/drivers/serial/uart_wch_usart.c
index 720da6f17f5..e7270d7de73 100644
--- a/drivers/serial/uart_wch_usart.c
+++ b/drivers/serial/uart_wch_usart.c
@@ -12,7 +12,7 @@
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/irq.h>
 
-#include <ch32fun.h>
+#include <hal_ch32fun.h>
 
 struct usart_wch_config {
 	USART_TypeDef *regs;
diff --git a/drivers/timer/wch_systick_ch32v00x.c b/drivers/timer/wch_systick_ch32v00x.c
index ae88b3179cb..c2bf3865f32 100644
--- a/drivers/timer/wch_systick_ch32v00x.c
+++ b/drivers/timer/wch_systick_ch32v00x.c
@@ -12,7 +12,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/sys/util.h>
 
-#include <ch32fun.h>
+#include <hal_ch32fun.h>
 
 #define STK_SWIE  BIT(31)
 #define STK_STRE  BIT(3)
diff --git a/modules/hal_wch/CMakeLists.txt b/modules/hal_wch/CMakeLists.txt
index 01797436ba8..049d1ea7907 100644
--- a/modules/hal_wch/CMakeLists.txt
+++ b/modules/hal_wch/CMakeLists.txt
@@ -1,3 +1,3 @@
 if(CONFIG_SOC_FAMILY_CH32V)
-  zephyr_include_directories(${ZEPHYR_HAL_WCH_MODULE_DIR}/ch32v003fun .)
+  zephyr_include_directories(${ZEPHYR_HAL_WCH_MODULE_DIR}/ch32fun .)
 endif()
diff --git a/modules/hal_wch/ch32fun.h b/modules/hal_wch/hal_ch32fun.h
similarity index 79%
rename from modules/hal_wch/ch32fun.h
rename to modules/hal_wch/hal_ch32fun.h
index 3a49c763b50..4048b2227eb 100644
--- a/modules/hal_wch/ch32fun.h
+++ b/modules/hal_wch/hal_ch32fun.h
@@ -9,22 +9,22 @@
 
 #if defined(CONFIG_SOC_CH32V003)
 #define CH32V003 1
-#include <ch32v003fun.h>
+#include <ch32fun.h>
 #endif
 
 #if defined(CONFIG_SOC_SERIES_CH32V00X)
 #define CH32V003 1
-#include <ch32v003fun.h>
+#include <ch32fun.h>
 #endif
 
 #if defined(CONFIG_SOC_SERIES_QINGKE_V4B)
 #define CH32V20x 1
-#include <ch32v003fun.h>
+#include <ch32fun.h>
 #endif
 
 #if defined(CONFIG_SOC_SERIES_QINGKE_V4C)
 #define CH32V20x 1
-#include <ch32v003fun.h>
+#include <ch32fun.h>
 #endif
 
 #endif
diff --git a/west.yml b/west.yml
index 517ab84ecdb..18a3a8a5ef3 100644
--- a/west.yml
+++ b/west.yml
@@ -260,7 +260,7 @@ manifest:
       groups:
         - hal
     - name: hal_wch
-      revision: 1de9d3e406726702ce7cfc504509a02ecc463554
+      revision: 941f5182b5577d168e0cbcc0c9dd26294c1806a5
       path: modules/hal/wch
       groups:
         - hal