diff --git a/boards/infineon/cy8cproto_062_4343w/cy8cproto_062_4343w_defconfig b/boards/infineon/cy8cproto_062_4343w/cy8cproto_062_4343w_defconfig
index 221643eca27..2bda7847628 100644
--- a/boards/infineon/cy8cproto_062_4343w/cy8cproto_062_4343w_defconfig
+++ b/boards/infineon/cy8cproto_062_4343w/cy8cproto_062_4343w_defconfig
@@ -17,9 +17,6 @@ CONFIG_UART_CONSOLE=y
 # Enable UART driver
 CONFIG_SERIAL=y
 
-# Enable GPIO driver
-CONFIG_GPIO=y
-
 # Enable clock controller
 CONFIG_CLOCK_CONTROL=y
 
diff --git a/boards/infineon/cy8cproto_063_ble/cy8cproto_063_ble_defconfig b/boards/infineon/cy8cproto_063_ble/cy8cproto_063_ble_defconfig
index 7d0d29ea39c..98136255552 100644
--- a/boards/infineon/cy8cproto_063_ble/cy8cproto_063_ble_defconfig
+++ b/boards/infineon/cy8cproto_063_ble/cy8cproto_063_ble_defconfig
@@ -18,9 +18,6 @@ CONFIG_UART_CONSOLE=y
 # Enable UART driver
 CONFIG_SERIAL=y
 
-# Enable GPIO
-CONFIG_GPIO=y
-
 # Enable clock controller
 CONFIG_CLOCK_CONTROL=y
 
diff --git a/boards/infineon/cyw920829m2evk_02/cyw920829m2evk_02_defconfig b/boards/infineon/cyw920829m2evk_02/cyw920829m2evk_02_defconfig
index 426cd85d30f..14c80355800 100644
--- a/boards/infineon/cyw920829m2evk_02/cyw920829m2evk_02_defconfig
+++ b/boards/infineon/cyw920829m2evk_02/cyw920829m2evk_02_defconfig
@@ -18,9 +18,6 @@ CONFIG_UART_CONSOLE=y
 # Enable UART driver
 CONFIG_SERIAL=y
 
-# Enable GPIO driver
-CONFIG_GPIO=y
-
 # Enable clock controller
 CONFIG_CLOCK_CONTROL=y
 
diff --git a/drivers/spi/Kconfig.ifx_cat1 b/drivers/spi/Kconfig.ifx_cat1
index d7dbbde1f7e..e08dc5e13cc 100644
--- a/drivers/spi/Kconfig.ifx_cat1
+++ b/drivers/spi/Kconfig.ifx_cat1
@@ -9,5 +9,6 @@ config SPI_INFINEON_CAT1
 	depends on DT_HAS_INFINEON_CAT1_SPI_ENABLED
 	select USE_INFINEON_SPI
 	select PINCTRL
+	select GPIO
 	help
 	  This option enables the SPI driver for Infineon CAT1 family.
diff --git a/drivers/wifi/infineon/Kconfig.airoc b/drivers/wifi/infineon/Kconfig.airoc
index 319253378d3..775396fb245 100644
--- a/drivers/wifi/infineon/Kconfig.airoc
+++ b/drivers/wifi/infineon/Kconfig.airoc
@@ -9,6 +9,7 @@ menuconfig WIFI_AIROC
 	select NET_L2_WIFI_MGMT
 	select SDIO_STACK
 	select SDHC
+	select GPIO
 	select WIFI_USE_NATIVE_NETWORKING
 	select USE_INFINEON_ABSTRACTION_RTOS
 	depends on DT_HAS_INFINEON_AIROC_WIFI_ENABLED