drivers: cat1: Updates to support latest version of HAL/PDL

- Refactoring to support latest versions of HAL/PDL Signed-off-by: Sreeram Tatapudi <sreeram.praveen@infineon.com>
2023-07-25 21:44:44 -07:00 · 2023-07-25 21:44:44 -07:00 · 09a07e42c0
commit 09a07e42c0
parent 044de03d57
11 changed files with 89 additions and 73 deletions
--- a/drivers/adc/adc_ifx_cat1.c
+++ b/drivers/adc/adc_ifx_cat1.c
@ -13,7 +13,7 @@

 #include <zephyr/drivers/adc.h>
 #include <cyhal_adc.h>
-#include <cyhal_utils_psoc.h>
+#include <cyhal_utils_impl.h>

 #define ADC_CONTEXT_USES_KERNEL_TIMER
 #include "adc_context.h"
--- a/drivers/gpio/gpio_ifx_cat1.c
+++ b/drivers/gpio/gpio_ifx_cat1.c
@ -104,8 +104,10 @@ static int gpio_cat1_configure(const struct device *dev,
 		break;

 	case GPIO_DISCONNECTED:
-		cyhal_gpio_free(gpio_pin);
-		return 0;
+		/* Handle this after calling cyhal_gpio_init(), otherwise it will cause an assert
+		 * from HAL for freeing an uninitialized pin
+		 */
+		break;

 	default:
 		return -ENOTSUP;
@ -121,7 +123,12 @@ static int gpio_cat1_configure(const struct device *dev,
 		status = cyhal_gpio_init(gpio_pin, gpio_dir, gpio_mode, pin_val);
 	}

+	if (flags & GPIO_DISCONNECTED) {
+		cyhal_gpio_free(gpio_pin);
+	}
+
 	return (status == CY_RSLT_SUCCESS) ? 0 : -EIO;
+
 }

 static int gpio_cat1_port_get_raw(const struct device *dev,
--- a/drivers/i2c/i2c_ifx_cat1.c
+++ b/drivers/i2c/i2c_ifx_cat1.c
@ -14,8 +14,8 @@
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <cyhal_i2c.h>
-#include <cyhal_utils_psoc.h>
-#include <cyhal_utils_psoc.h>
+#include <cyhal_utils_impl.h>
+#include <cyhal_utils_impl.h>
 #include <cyhal_scb_common.h>

 #include <zephyr/logging/log.h>
--- a/drivers/serial/uart_ifx_cat1.c
+++ b/drivers/serial/uart_ifx_cat1.c
@ -18,7 +18,7 @@
 #include <zephyr/drivers/uart.h>
 #include <zephyr/drivers/pinctrl.h>
 #include <cyhal_uart.h>
-#include <cyhal_utils_psoc.h>
+#include <cyhal_utils_impl.h>
 #include <cyhal_scb_common.h>

 /* Data structure */
--- a/modules/hal_infineon/CMakeLists.txt
+++ b/modules/hal_infineon/CMakeLists.txt
@ -18,6 +18,9 @@ if (CONFIG_SOC_FAMILY_INFINEON_CAT1A OR CONFIG_SOC_FAMILY_PSOC6)

  ## Add mtb-pdl-cat1 sources for CAT1 devices
  add_subdirectory(mtb-pdl-cat1)
+
+  ## Add mtb-templates-cat1 sources for CAT1 devices
+  add_subdirectory(mtb-template-cat1)
 endif()

 if (CONFIG_SOC_FAMILY_INFINEON_CAT1A)
--- a/modules/hal_infineon/mtb-hal-cat1/CMakeLists.txt
+++ b/modules/hal_infineon/mtb-hal-cat1/CMakeLists.txt
@ -3,9 +3,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0

-set(hal_dir               ${ZEPHYR_HAL_INFINEON_MODULE_DIR}/mtb-hal-cat1)
-set(hal_psoc6_dir         ${hal_dir}/COMPONENT_PSOC6HAL)
-set(hal_psoc6_cat1a_dir   ${hal_dir}/COMPONENT_PSOC6HAL/COMPONENT_CAT1A)
+set(hal_dir         ${ZEPHYR_HAL_INFINEON_MODULE_DIR}/mtb-hal-cat1)
+set(hal_cat1a_dir   ${hal_dir}/COMPONENT_CAT1A)

 # PSoC 6 family defines
 zephyr_compile_definitions_ifdef(CONFIG_SOC_FAMILY_INFINEON_CAT1A COMPONENT_CAT1A)
@ -14,95 +13,95 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_FAMILY_INFINEON_CAT1 CY_USING_HAL)

 # Add mtb-hal-cat1
 zephyr_include_directories(${hal_dir}/include)
-zephyr_include_directories(${hal_dir}/COMPONENT_PSOC6HAL/include)
-zephyr_include_directories(${hal_dir}/COMPONENT_PSOC6HAL/COMPONENT_CAT1A/include)
+zephyr_include_directories(${hal_dir}/include_pvt)
+zephyr_include_directories_ifdef(CONFIG_SOC_FAMILY_INFINEON_CAT1A ${hal_cat1a_dir}/include)

 # Packages sources
 zephyr_library_sources_ifdef(CONFIG_SOC_PACKAGE_PSOC6_01_104_M_CSP_BLE
-  ${hal_psoc6_cat1a_dir}/source/pin_packages/cyhal_psoc6_01_104_m_csp_ble.c)
+  ${hal_cat1a_dir}/source/pin_packages/cyhal_psoc6_01_104_m_csp_ble.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_PACKAGE_PSOC6_01_104_M_CSP_BLE_USB
-  ${hal_psoc6_cat1a_dir}/source/pin_packages/cyhal_psoc6_01_104_m_csp_ble_usb.c)
+  ${hal_cat1a_dir}/source/pin_packages/cyhal_psoc6_01_104_m_csp_ble_usb.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_PACKAGE_PSOC6_01_116_BGA_BLE
-  ${hal_psoc6_cat1a_dir}/source/pin_packages/cyhal_psoc6_01_116_bga_ble.c)
+  ${hal_cat1a_dir}/source/pin_packages/cyhal_psoc6_01_116_bga_ble.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_PACKAGE_PSOC6_01_116_BGA_USB
-  ${hal_psoc6_cat1a_dir}/source/pin_packages/cyhal_psoc6_01_116_bga_usb.c)
+  ${hal_cat1a_dir}/source/pin_packages/cyhal_psoc6_01_116_bga_usb.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_PACKAGE_PSOC6_01_124_BGA
-  ${hal_psoc6_cat1a_dir}/source/pin_packages/cyhal_psoc6_01_124_bga.c)
+  ${hal_cat1a_dir}/source/pin_packages/cyhal_psoc6_01_124_bga.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_PACKAGE_PSOC6_01_124_BGA_SIP
-  ${hal_psoc6_cat1a_dir}/source/pin_packages/cyhal_psoc6_01_124_bga_sip.c)
+  ${hal_cat1a_dir}/source/pin_packages/cyhal_psoc6_01_124_bga_sip.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_PACKAGE_PSOC6_01_43_SMT
-  ${hal_psoc6_cat1a_dir}/source/pin_packages/cyhal_psoc6_01_43_smt.c)
+  ${hal_cat1a_dir}/source/pin_packages/cyhal_psoc6_01_43_smt.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_PACKAGE_PSOC6_01_68_QFN_BLE
-  ${hal_psoc6_cat1a_dir}/source/pin_packages/cyhal_psoc6_01_68_qfn_ble.c)
+  ${hal_cat1a_dir}/source/pin_packages/cyhal_psoc6_01_68_qfn_ble.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_PACKAGE_PSOC6_01_80_WLCSP
-  ${hal_psoc6_cat1a_dir}/source/pin_packages/cyhal_psoc6_01_80_wlcsp.c)
+  ${hal_cat1a_dir}/source/pin_packages/cyhal_psoc6_01_80_wlcsp.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_PACKAGE_PSOC6_02_100_WLCSP
-  ${hal_psoc6_cat1a_dir}/source/pin_packages/cyhal_psoc6_02_100_wlcsp.c)
+  ${hal_cat1a_dir}/source/pin_packages/cyhal_psoc6_02_100_wlcsp.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_PACKAGE_PSOC6_02_124_BGA
-  ${hal_psoc6_cat1a_dir}/source/pin_packages/cyhal_psoc6_02_124_bga.c)
+  ${hal_cat1a_dir}/source/pin_packages/cyhal_psoc6_02_124_bga.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_PACKAGE_PSOC6_02_128_TQFP
-  ${hal_psoc6_cat1a_dir}/source/pin_packages/cyhal_psoc6_02_128_tqfp.c)
+  ${hal_cat1a_dir}/source/pin_packages/cyhal_psoc6_02_128_tqfp.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_PACKAGE_PSOC6_02_68_QFN
-  ${hal_psoc6_cat1a_dir}/source/pin_packages/cyhal_psoc6_02_68_qfn.c)
+  ${hal_cat1a_dir}/source/pin_packages/cyhal_psoc6_02_68_qfn.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_PACKAGE_PSOC6_03_100_TQFP
-  ${hal_psoc6_cat1a_dir}/source/pin_packages/cyhal_psoc6_03_100_tqfp.c)
+  ${hal_cat1a_dir}/source/pin_packages/cyhal_psoc6_03_100_tqfp.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_PACKAGE_PSOC6_03_49_WLCSP
-  ${hal_psoc6_cat1a_dir}/source/pin_packages/cyhal_psoc6_03_49_wlcsp.c)
+  ${hal_cat1a_dir}/source/pin_packages/cyhal_psoc6_03_49_wlcsp.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_PACKAGE_PSOC6_03_68_QFN
-  ${hal_psoc6_cat1a_dir}/source/pin_packages/cyhal_psoc6_03_68_qfn.c)
+  ${hal_cat1a_dir}/source/pin_packages/cyhal_psoc6_03_68_qfn.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_PACKAGE_PSOC6_04_64_TQFP
-  ${hal_psoc6_cat1a_dir}/source/pin_packages/cyhal_psoc6_04_64_tqfp.c)
+  ${hal_cat1a_dir}/source/pin_packages/cyhal_psoc6_04_64_tqfp.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_PACKAGE_PSOC6_04_68_QFN
-  ${hal_psoc6_cat1a_dir}/source/pin_packages/cyhal_psoc6_04_68_qfn.c)
+  ${hal_cat1a_dir}/source/pin_packages/cyhal_psoc6_04_68_qfn.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_PACKAGE_PSOC6_04_80_TQFP
-  ${hal_psoc6_cat1a_dir}/source/pin_packages/cyhal_psoc6_04_80_tqfp.c)
+  ${hal_cat1a_dir}/source/pin_packages/cyhal_psoc6_04_80_tqfp.c)

 zephyr_library_sources_ifdef(CONFIG_SOC_DIE_PSOC6_01
-  ${hal_psoc6_cat1a_dir}/source/triggers/cyhal_triggers_psoc6_01.c)
+  ${hal_cat1a_dir}/source/triggers/cyhal_triggers_psoc6_01.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_DIE_PSOC6_02
-  ${hal_psoc6_cat1a_dir}/source/triggers/cyhal_triggers_psoc6_02.c)
+  ${hal_cat1a_dir}/source/triggers/cyhal_triggers_psoc6_02.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_DIE_PSOC6_03
-  ${hal_psoc6_cat1a_dir}/source/triggers/cyhal_triggers_psoc6_03.c)
+  ${hal_cat1a_dir}/source/triggers/cyhal_triggers_psoc6_03.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_DIE_PSOC6_04
-  ${hal_psoc6_cat1a_dir}/source/triggers/cyhal_triggers_psoc6_04.c)
+  ${hal_cat1a_dir}/source/triggers/cyhal_triggers_psoc6_04.c)

 # High level interface for interacting with CAT1 hardware
-zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_ADC     ${hal_psoc6_dir}/source/cyhal_adc_sar.c)
-zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_FLASH   ${hal_psoc6_dir}/source/cyhal_flash.c)
-zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_I2C     ${hal_psoc6_dir}/source/cyhal_i2c.c)
-zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_LPTIMER ${hal_psoc6_dir}/source/cyhal_lptimer.c)
-zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_PWM     ${hal_psoc6_dir}/source/cyhal_pwm.c)
-zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_RTC     ${hal_psoc6_dir}/source/cyhal_rtc.c)
-zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_SDIO    ${hal_psoc6_dir}/source/cyhal_sdhc.c)
-zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_SPI     ${hal_psoc6_dir}/source/cyhal_spi.c)
-zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_TIMER   ${hal_psoc6_dir}/source/cyhal_timer.c)
-zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_TRNG    ${hal_psoc6_dir}/source/cyhal_trng.c)
-zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_UART    ${hal_psoc6_dir}/source/cyhal_uart.c)
-zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_WDT     ${hal_psoc6_dir}/source/cyhal_wdt.c)
-
+zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_ADC     ${hal_dir}/source/cyhal_adc_sar.c)
+zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_FLASH   ${hal_dir}/source/cyhal_nvm.c)
+zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_I2C     ${hal_dir}/source/cyhal_i2c.c)
+zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_LPTIMER ${hal_dir}/source/cyhal_lptimer.c)
+zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_PWM     ${hal_dir}/source/cyhal_pwm.c)
+zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_RTC     ${hal_dir}/source/cyhal_rtc.c)
+zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_SDIO    ${hal_dir}/source/cyhal_sdhc.c)
+zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_SPI     ${hal_dir}/source/cyhal_spi.c)
+zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_TIMER   ${hal_dir}/source/cyhal_timer.c)
+zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_TRNG    ${hal_dir}/source/cyhal_trng.c)
+zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_UART    ${hal_dir}/source/cyhal_uart.c)
+zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_WDT     ${hal_dir}/source/cyhal_wdt.c)

 if(CONFIG_USE_INFINEON_ADC)
-  zephyr_library_sources(${hal_psoc6_dir}/source/cyhal_analog_common.c)
-  zephyr_library_sources(${hal_psoc6_dir}/source/cyhal_dma.c)
-  zephyr_library_sources(${hal_psoc6_dir}/source/cyhal_dma_dmac.c)
-  zephyr_library_sources(${hal_psoc6_dir}/source/cyhal_dma_dw.c)
+  zephyr_library_sources(${hal_dir}/source/cyhal_analog_common.c)
+  zephyr_library_sources(${hal_dir}/source/cyhal_dma.c)
+  zephyr_library_sources(${hal_dir}/source/cyhal_dma_dmac.c)
+  zephyr_library_sources(${hal_dir}/source/cyhal_dma_dw.c)
 endif()

 if(CONFIG_USE_INFINEON_TIMER)
-  zephyr_library_sources(${hal_psoc6_dir}/source/cyhal_tcpwm_common.c)
+  zephyr_library_sources(${hal_dir}/source/cyhal_tcpwm_common.c)
 endif()

 if(CONFIG_USE_INFINEON_UART OR CONFIG_USE_INFINEON_I2C OR CONFIG_USE_INFINEON_SPI)
-  zephyr_library_sources(${hal_psoc6_dir}/source/cyhal_scb_common.c)
+  zephyr_library_sources(${hal_dir}/source/cyhal_scb_common.c)
 endif()

 # Common part
-zephyr_library_sources(${hal_psoc6_dir}/source/cyhal_clock.c)
-zephyr_library_sources(${hal_psoc6_dir}/source/cyhal_gpio.c)
-zephyr_library_sources(${hal_psoc6_dir}/source/cyhal_hwmgr.c)
-zephyr_library_sources(${hal_psoc6_dir}/source/cyhal_interconnect.c)
-zephyr_library_sources(${hal_psoc6_dir}/source/cyhal_syspm.c)
-zephyr_library_sources(${hal_psoc6_dir}/source/cyhal_system.c)
-zephyr_library_sources(${hal_psoc6_dir}/source/cyhal_utils.c)
-zephyr_library_sources(${hal_psoc6_dir}/source/cyhal_utils_psoc.c)
-zephyr_library_sources(${hal_psoc6_dir}/source/cyhal_wdt.c)
+zephyr_library_sources(${hal_dir}/source/cyhal_clock.c)
+zephyr_library_sources(${hal_dir}/source/cyhal_gpio.c)
+zephyr_library_sources(${hal_dir}/source/cyhal_hwmgr.c)
+zephyr_library_sources(${hal_dir}/source/cyhal_interconnect.c)
+zephyr_library_sources(${hal_dir}/source/cyhal_syspm.c)
+zephyr_library_sources(${hal_dir}/source/cyhal_system.c)
+zephyr_library_sources(${hal_dir}/source/cyhal_utils.c)
+zephyr_library_sources(${hal_dir}/source/cyhal_utils_impl.c)
+zephyr_library_sources(${hal_dir}/source/cyhal_wdt.c)
+zephyr_library_sources(${hal_dir}/source/cyhal_irq_impl.c)
--- a/modules/hal_infineon/mtb-pdl-cat1/CMakeLists.txt
+++ b/modules/hal_infineon/mtb-pdl-cat1/CMakeLists.txt
@ -14,15 +14,9 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_FAMILY_INFINEON_CAT1 ${CONFIG_SOC})
 zephyr_include_directories(${pdl_drv_dir}/include)
 zephyr_include_directories(${pdl_dev_cat1a_dir}/include)
 zephyr_include_directories(${pdl_dev_cat1a_dir}/include/ip)
-zephyr_include_directories(${pdl_dev_cat1a_dir}/templates/COMPONENT_MTB)

 zephyr_library_sources(${pdl_dev_cat1a_dir}/source/cy_device.c)
-zephyr_library_sources(${pdl_drv_dir}/source/TOOLCHAIN_GCC_ARM/cy_syslib_gcc.S)
-
-zephyr_library_sources_ifdef(CONFIG_CPU_CORTEX_M4
-  ${pdl_dev_cat1a_dir}/templates/COMPONENT_MTB/COMPONENT_CM4/system_psoc6_cm4.c)
-zephyr_library_sources_ifdef(CONFIG_CPU_CORTEX_M0PLUS
-  ${pdl_dev_cat1a_dir}/templates/COMPONENT_MTB/COMPONENT_CM0P/system_psoc6_cm0plus.c)
+zephyr_library_sources(${pdl_drv_dir}/source/TOOLCHAIN_GCC_ARM/cy_syslib_ext.S)

 # Peripheral drivers
 zephyr_library_sources_ifdef(CONFIG_SOC_FAMILY_PSOC6      ${pdl_drv_dir}/source/cy_sysint.c)
@ -30,7 +24,6 @@ zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_ADC      ${pdl_drv_dir}/source/
 zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_I2C      ${pdl_drv_dir}/source/cy_scb_i2c.c)
 zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_LPTIMER  ${pdl_drv_dir}/source/cy_mcwdt.c)
 zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_PWM      ${pdl_drv_dir}/source/cy_tcpwm_pwm.c)
-zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_RTC      ${pdl_drv_dir}/source/cy_rtc.c)
 zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_SDIO     ${pdl_drv_dir}/source/cy_sd_host.c)
 zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_SPI      ${pdl_drv_dir}/source/cy_scb_spi.c)
 zephyr_library_sources_ifdef(CONFIG_USE_INFINEON_TIMER    ${pdl_drv_dir}/source/cy_tcpwm_counter.c)
--- a/modules/hal_infineon/mtb-template-cat1/CMakeLists.txt
+++ b/modules/hal_infineon/mtb-template-cat1/CMakeLists.txt
@ -0,0 +1,14 @@
+# Copyright (c) 2023 Cypress Semiconductor Corporation (an Infineon company) or
+# an affiliate of Cypress Semiconductor Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+set(template_dir ${ZEPHYR_HAL_INFINEON_MODULE_DIR}/mtb-template-cat1)
+set(cat1a_dir ${template_dir}/files/templates/cat1a)
+
+zephyr_include_directories(${cat1a_dir}/COMPONENT_MTB)
+
+zephyr_library_sources_ifdef(CONFIG_CPU_CORTEX_M4
+	${cat1a_dir}/COMPONENT_MTB/COMPONENT_CM4/system_psoc6_cm4.c)
+zephyr_library_sources_ifdef(CONFIG_CPU_CORTEX_M0PLUS
+	${cat1a_dir}/COMPONENT_MTB/COMPONENT_CM0P/system_psoc6_cm0plus.c)
--- a/soc/arm/infineon_cat1/psoc6/Kconfig.defconfig.soc.psoc6_01
+++ b/soc/arm/infineon_cat1/psoc6/Kconfig.defconfig.soc.psoc6_01
@ -57,7 +57,7 @@ config SOC
 	default "CY8C6347BZI_BLD34" if SOC_CY8C6347BZI_BLD34
 	default "CY8C6347BZI_BLD54" if SOC_CY8C6347BZI_BLD54
 	default "CY8C6247BFI_D54" if SOC_CY8C6247BFI_D54
-	default "CYBLE_416045_02" if SOC_CYBLE_416045_02
+	default "CYBLE_416045_02_device" if SOC_CYBLE_416045_02
 	default "CY8C6347FMI_BUD53" if SOC_CY8C6347FMI_BUD53
 	default "CY8C6347FMI_BUD13" if SOC_CY8C6347FMI_BUD13
 	default "CY8C6347FMI_BUD43" if SOC_CY8C6347FMI_BUD43
--- a/soc/arm/infineon_cat1/psoc6/Kconfig.soc.psoc6_01
+++ b/soc/arm/infineon_cat1/psoc6/Kconfig.soc.psoc6_01
@ -283,7 +283,7 @@ config SOC_CY8C6247BFI_D54
 config SOC_CYBLE_416045_02
 	bool "CYBLE_416045_02"
 	select SOC_DIE_PSOC6_01
-	select SOC_PACKAGE_PSOC6_01_43_SMT
+	select SOC_PACKAGE_PSOC6_01_116_BGA_BLE
 	depends on SOC_SERIES_PSOC_63

 config SOC_CY8C6347FMI_BUD53
--- a/west.yml
+++ b/west.yml
@ -168,7 +168,7 @@ manifest:
      groups:
        - hal
    - name: hal_infineon
-      revision: 0bebc14d8bd1a249ee7fbc70b37db6f01f72544f
+      revision: 815e84a5150f95627201f192779a0180d5052de7
      path: modules/hal/infineon
      groups:
        - hal