From 4cef9572d2cf87bfd39b1c50e87763a166352158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=8C=E6=96=B0=E6=BA=90?= <1648576390@qq.com> Date: Tue, 15 Sep 2026 21:23:45 +0800 Subject: [PATCH] [bsp/Infineon] Fix PWM macro mismatches left by the CHx_PORTy rename Commit e5382cb733 renamed the PWM table guards in drv_pwm.c to the CHx_PORTy convention but only adapted the psoc6-evk Kconfig, leaving several mismatches behind: - The psoc6-evaluationkit-062S2 slider sample still tested the old flat name BSP_USING_PWM0_PORT0 while the board Kconfig defines BSP_USING_PWM0_CH0_PORT0, so the PWM init was compiled out. - The PORT13 entry was renamed to BSP_USING_PWM0_CH7_PORT13, a macro that no Kconfig defines, and the channel is wrong anyway: PWM0_CH3_PORT13_CONFIG carries .channel = 3, PORT13 sits under the PWM0 CH3 menu, and the slider demo selects CH3 + PORT13. - The PSOC62 template and five psoc6 boards (cy8ckit-062-BLE, cy8ckit-062-WIFI-BT, cy8ckit-062S2-43012, cy8ckit-062s4, cy8cproto-062S3-4343W) still define the old flat names. Fix all of them by migrating the evaluationkit sample to BSP_USING_PWM0_CH0_PORT0 and renaming the PORT13 group to BSP_USING_PWM0_CH3_PORT13 across drv_pwm.c, the PSOC62 template and the five boards' Kconfigs/slider samples, so Kconfig, driver table and samples match again. Note: the sibling guards BSP_USING_PWM0_CH7_PORT2/5/7/9/10/12 are still not generated by these boards' Kconfigs; left untouched for a separate discussion. --- bsp/Infineon/libraries/HAL_Drivers/drv_pwm.c | 2 +- bsp/Infineon/libraries/templates/PSOC62/board/Kconfig | 4 ++-- .../libraries/templates/PSOC62/board/ports/slider_sample.c | 2 +- bsp/Infineon/psoc6-cy8ckit-062-BLE/board/Kconfig | 4 ++-- .../psoc6-cy8ckit-062-BLE/board/ports/slider_sample.c | 2 +- bsp/Infineon/psoc6-cy8ckit-062-WIFI-BT/board/Kconfig | 4 ++-- .../psoc6-cy8ckit-062-WIFI-BT/board/ports/slider_sample.c | 2 +- bsp/Infineon/psoc6-cy8ckit-062S2-43012/board/Kconfig | 6 +++--- .../psoc6-cy8ckit-062S2-43012/board/ports/slider_sample.c | 2 +- bsp/Infineon/psoc6-cy8ckit-062s4/board/Kconfig | 4 ++-- .../psoc6-cy8ckit-062s4/board/ports/slider_sample.c | 2 +- bsp/Infineon/psoc6-cy8cproto-062S3-4343W/board/Kconfig | 6 +++--- .../psoc6-cy8cproto-062S3-4343W/board/ports/slider_sample.c | 2 +- .../psoc6-evaluationkit-062S2/board/ports/slider_sample.c | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/bsp/Infineon/libraries/HAL_Drivers/drv_pwm.c b/bsp/Infineon/libraries/HAL_Drivers/drv_pwm.c index af7afbde11bf..b0e6b9651105 100644 --- a/bsp/Infineon/libraries/HAL_Drivers/drv_pwm.c +++ b/bsp/Infineon/libraries/HAL_Drivers/drv_pwm.c @@ -75,7 +75,7 @@ static struct ifx_pwm ifx_pwm_obj[] = PWM0_CH7_PORT12_CONFIG, #endif -#ifdef BSP_USING_PWM0_CH7_PORT13 +#ifdef BSP_USING_PWM0_CH3_PORT13 PWM0_CH3_PORT13_CONFIG, #endif }; diff --git a/bsp/Infineon/libraries/templates/PSOC62/board/Kconfig b/bsp/Infineon/libraries/templates/PSOC62/board/Kconfig index a8530c34dece..12042f859b55 100644 --- a/bsp/Infineon/libraries/templates/PSOC62/board/Kconfig +++ b/bsp/Infineon/libraries/templates/PSOC62/board/Kconfig @@ -61,8 +61,8 @@ menu "On-chip Peripheral Drivers" bool "Enable PWM0 channel3" default n if BSP_USING_PWM0_CH3 - config BSP_USING_PWM0_PORT13 - bool "Enable PWM0-PORT13 output pwm" + config BSP_USING_PWM0_CH3_PORT13 + bool "Enable PWM0-CH3-PORT13 output pwm" default n endif menuconfig BSP_USING_PWM0_CH7 diff --git a/bsp/Infineon/libraries/templates/PSOC62/board/ports/slider_sample.c b/bsp/Infineon/libraries/templates/PSOC62/board/ports/slider_sample.c index 829094f5f257..944114e47301 100644 --- a/bsp/Infineon/libraries/templates/PSOC62/board/ports/slider_sample.c +++ b/bsp/Infineon/libraries/templates/PSOC62/board/ports/slider_sample.c @@ -127,7 +127,7 @@ void Slider_Init(void) return; } -#ifdef BSP_USING_PWM0_PORT13 +#ifdef BSP_USING_PWM0_CH3_PORT13 /* Initiate PWM*/ pwm_dev = (struct rt_device_pwm *)rt_device_find(PWM_DEV_NAME); diff --git a/bsp/Infineon/psoc6-cy8ckit-062-BLE/board/Kconfig b/bsp/Infineon/psoc6-cy8ckit-062-BLE/board/Kconfig index b5e70669498f..6d268136a89f 100644 --- a/bsp/Infineon/psoc6-cy8ckit-062-BLE/board/Kconfig +++ b/bsp/Infineon/psoc6-cy8ckit-062-BLE/board/Kconfig @@ -61,8 +61,8 @@ menu "On-chip Peripheral Drivers" bool "Enable PWM0 channel3" default n if BSP_USING_PWM0_CH3 - config BSP_USING_PWM0_PORT13 - bool "Enable PWM0-PORT13 output pwm" + config BSP_USING_PWM0_CH3_PORT13 + bool "Enable PWM0-CH3-PORT13 output pwm" default n endif menuconfig BSP_USING_PWM0_CH7 diff --git a/bsp/Infineon/psoc6-cy8ckit-062-BLE/board/ports/slider_sample.c b/bsp/Infineon/psoc6-cy8ckit-062-BLE/board/ports/slider_sample.c index 829094f5f257..944114e47301 100644 --- a/bsp/Infineon/psoc6-cy8ckit-062-BLE/board/ports/slider_sample.c +++ b/bsp/Infineon/psoc6-cy8ckit-062-BLE/board/ports/slider_sample.c @@ -127,7 +127,7 @@ void Slider_Init(void) return; } -#ifdef BSP_USING_PWM0_PORT13 +#ifdef BSP_USING_PWM0_CH3_PORT13 /* Initiate PWM*/ pwm_dev = (struct rt_device_pwm *)rt_device_find(PWM_DEV_NAME); diff --git a/bsp/Infineon/psoc6-cy8ckit-062-WIFI-BT/board/Kconfig b/bsp/Infineon/psoc6-cy8ckit-062-WIFI-BT/board/Kconfig index d2331656df90..2398aa9f3a4f 100644 --- a/bsp/Infineon/psoc6-cy8ckit-062-WIFI-BT/board/Kconfig +++ b/bsp/Infineon/psoc6-cy8ckit-062-WIFI-BT/board/Kconfig @@ -61,8 +61,8 @@ menu "On-chip Peripheral Drivers" bool "Enable PWM0 channel3" default n if BSP_USING_PWM0_CH3 - config BSP_USING_PWM0_PORT13 - bool "Enable PWM0-PORT13 output pwm" + config BSP_USING_PWM0_CH3_PORT13 + bool "Enable PWM0-CH3-PORT13 output pwm" default n endif menuconfig BSP_USING_PWM0_CH7 diff --git a/bsp/Infineon/psoc6-cy8ckit-062-WIFI-BT/board/ports/slider_sample.c b/bsp/Infineon/psoc6-cy8ckit-062-WIFI-BT/board/ports/slider_sample.c index 829094f5f257..944114e47301 100644 --- a/bsp/Infineon/psoc6-cy8ckit-062-WIFI-BT/board/ports/slider_sample.c +++ b/bsp/Infineon/psoc6-cy8ckit-062-WIFI-BT/board/ports/slider_sample.c @@ -127,7 +127,7 @@ void Slider_Init(void) return; } -#ifdef BSP_USING_PWM0_PORT13 +#ifdef BSP_USING_PWM0_CH3_PORT13 /* Initiate PWM*/ pwm_dev = (struct rt_device_pwm *)rt_device_find(PWM_DEV_NAME); diff --git a/bsp/Infineon/psoc6-cy8ckit-062S2-43012/board/Kconfig b/bsp/Infineon/psoc6-cy8ckit-062S2-43012/board/Kconfig index e39798ab56db..f6ba3eb1bdd8 100644 --- a/bsp/Infineon/psoc6-cy8ckit-062S2-43012/board/Kconfig +++ b/bsp/Infineon/psoc6-cy8ckit-062S2-43012/board/Kconfig @@ -61,8 +61,8 @@ menu "On-chip Peripheral Drivers" bool "Enable PWM0 channel3" default n if BSP_USING_PWM0_CH3 - config BSP_USING_PWM0_PORT13 - bool "Enable PWM0-PORT13 output pwm" + config BSP_USING_PWM0_CH3_PORT13 + bool "Enable PWM0-CH3-PORT13 output pwm" default n endif menuconfig BSP_USING_PWM0_CH7 @@ -270,7 +270,7 @@ menu "Board extended module Drivers" select BSP_USING_PWM select BSP_USING_PWM0 select BSP_USING_PWM0_CH3 - select BSP_USING_PWM0_PORT13 + select BSP_USING_PWM0_CH3_PORT13 default n endif diff --git a/bsp/Infineon/psoc6-cy8ckit-062S2-43012/board/ports/slider_sample.c b/bsp/Infineon/psoc6-cy8ckit-062S2-43012/board/ports/slider_sample.c index a4599ceaa70e..3e0059e8553e 100644 --- a/bsp/Infineon/psoc6-cy8ckit-062S2-43012/board/ports/slider_sample.c +++ b/bsp/Infineon/psoc6-cy8ckit-062S2-43012/board/ports/slider_sample.c @@ -128,7 +128,7 @@ void Slider_Init(void) return; } -#ifdef BSP_USING_PWM0_PORT13 +#ifdef BSP_USING_PWM0_CH3_PORT13 /* Initiate PWM*/ pwm_dev = (struct rt_device_pwm *)rt_device_find(PWM_DEV_NAME); diff --git a/bsp/Infineon/psoc6-cy8ckit-062s4/board/Kconfig b/bsp/Infineon/psoc6-cy8ckit-062s4/board/Kconfig index 67de175efda2..7c83b2a75629 100644 --- a/bsp/Infineon/psoc6-cy8ckit-062s4/board/Kconfig +++ b/bsp/Infineon/psoc6-cy8ckit-062s4/board/Kconfig @@ -61,8 +61,8 @@ menu "On-chip Peripheral Drivers" bool "Enable PWM0 channel3" default n if BSP_USING_PWM0_CH3 - config BSP_USING_PWM0_PORT13 - bool "Enable PWM0-PORT13 output pwm" + config BSP_USING_PWM0_CH3_PORT13 + bool "Enable PWM0-CH3-PORT13 output pwm" default n endif menuconfig BSP_USING_PWM0_CH7 diff --git a/bsp/Infineon/psoc6-cy8ckit-062s4/board/ports/slider_sample.c b/bsp/Infineon/psoc6-cy8ckit-062s4/board/ports/slider_sample.c index 829094f5f257..944114e47301 100644 --- a/bsp/Infineon/psoc6-cy8ckit-062s4/board/ports/slider_sample.c +++ b/bsp/Infineon/psoc6-cy8ckit-062s4/board/ports/slider_sample.c @@ -127,7 +127,7 @@ void Slider_Init(void) return; } -#ifdef BSP_USING_PWM0_PORT13 +#ifdef BSP_USING_PWM0_CH3_PORT13 /* Initiate PWM*/ pwm_dev = (struct rt_device_pwm *)rt_device_find(PWM_DEV_NAME); diff --git a/bsp/Infineon/psoc6-cy8cproto-062S3-4343W/board/Kconfig b/bsp/Infineon/psoc6-cy8cproto-062S3-4343W/board/Kconfig index 2ce35dc70406..7b6f79b46f3d 100644 --- a/bsp/Infineon/psoc6-cy8cproto-062S3-4343W/board/Kconfig +++ b/bsp/Infineon/psoc6-cy8cproto-062S3-4343W/board/Kconfig @@ -61,8 +61,8 @@ menu "On-chip Peripheral Drivers" bool "Enable PWM0 channel3" default n if BSP_USING_PWM0_CH3 - config BSP_USING_PWM0_PORT13 - bool "Enable PWM0-PORT13 output pwm" + config BSP_USING_PWM0_CH3_PORT13 + bool "Enable PWM0-CH3-PORT13 output pwm" default n endif menuconfig BSP_USING_PWM0_CH7 @@ -270,7 +270,7 @@ menu "Board extended module Drivers" select BSP_USING_PWM select BSP_USING_PWM0 select BSP_USING_PWM0_CH3 - select BSP_USING_PWM0_PORT13 + select BSP_USING_PWM0_CH3_PORT13 default n endif diff --git a/bsp/Infineon/psoc6-cy8cproto-062S3-4343W/board/ports/slider_sample.c b/bsp/Infineon/psoc6-cy8cproto-062S3-4343W/board/ports/slider_sample.c index a4599ceaa70e..3e0059e8553e 100644 --- a/bsp/Infineon/psoc6-cy8cproto-062S3-4343W/board/ports/slider_sample.c +++ b/bsp/Infineon/psoc6-cy8cproto-062S3-4343W/board/ports/slider_sample.c @@ -128,7 +128,7 @@ void Slider_Init(void) return; } -#ifdef BSP_USING_PWM0_PORT13 +#ifdef BSP_USING_PWM0_CH3_PORT13 /* Initiate PWM*/ pwm_dev = (struct rt_device_pwm *)rt_device_find(PWM_DEV_NAME); diff --git a/bsp/Infineon/psoc6-evaluationkit-062S2/board/ports/slider_sample.c b/bsp/Infineon/psoc6-evaluationkit-062S2/board/ports/slider_sample.c index cc7931fa5757..8453c646a95d 100644 --- a/bsp/Infineon/psoc6-evaluationkit-062S2/board/ports/slider_sample.c +++ b/bsp/Infineon/psoc6-evaluationkit-062S2/board/ports/slider_sample.c @@ -128,7 +128,7 @@ void Slider_Init(void) return; } -#ifdef BSP_USING_PWM0_PORT0 +#ifdef BSP_USING_PWM0_CH0_PORT0 /* Initiate PWM*/ pwm_dev = (struct rt_device_pwm *)rt_device_find(PWM_DEV_NAME);