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>

Author: miggazElquez

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)

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
 

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>

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)),

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)),

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;

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)

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()

modules/hal_wch/ch32fun.h renamed to 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

west.yml

@@ -265,7 +265,7 @@ manifest:
       groups:
         - hal
     - name: hal_wch
-      revision: 1de9d3e406726702ce7cfc504509a02ecc463554
+      revision: 941f5182b5577d168e0cbcc0c9dd26294c1806a5
       path: modules/hal/wch
       groups:
         - hal