diff --git a/boards/cypress/cy8ckit_062_ble/cy8ckit_062_ble_cy8c6347_m4.dts b/boards/cypress/cy8ckit_062_ble/cy8ckit_062_ble_cy8c6347_m4.dts
index e232445e811a6..dc702bf2a7661 100644
--- a/boards/cypress/cy8ckit_062_ble/cy8ckit_062_ble_cy8c6347_m4.dts
+++ b/boards/cypress/cy8ckit_062_ble/cy8ckit_062_ble_cy8c6347_m4.dts
@@ -9,13 +9,28 @@
 
 #include <infineon/cat1a/legacy/psoc6_cm4.dtsi>
 #include "cy8ckit_062_ble_common.dtsi"
+#include "cy8ckit_062_ble_cy8c6347-pinctrl.dtsi"
 
 / {
 	model = "Cypress PSoC6 BLE Pioneer Kit";
 	compatible = "cypress,cy8c6xx7_cm4", "cypress,psoc6";
 
+	aliases {
+		uart-6 = &uart6;
+	};
+
 	chosen {
 		zephyr,sram = &sram2;
 		zephyr,flash = &flash1;
+		zephyr,console = &uart6;
+		zephyr,shell-uart = &uart6;
 	};
 };
+
+&uart6 {
+	status = "okay";
+	current-speed = <115200>;
+
+	pinctrl-0 = <&p13_0_scb6_uart_rx &p13_1_scb6_uart_tx>;
+	pinctrl-names = "default";
+};
diff --git a/boards/cypress/cy8ckit_062_ble/cy8ckit_062_ble_cy8c6347_m4_0_0_0.overlay b/boards/cypress/cy8ckit_062_ble/cy8ckit_062_ble_cy8c6347_m4_0_0_0.overlay
deleted file mode 100644
index 26f422a9b4dc3..0000000000000
--- a/boards/cypress/cy8ckit_062_ble/cy8ckit_062_ble_cy8c6347_m4_0_0_0.overlay
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2021, ATL Electronics
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "cy8ckit_062_ble_cy8c6347-pinctrl.dtsi"
-
-/ {
-	aliases {
-		uart-6 = &uart6;
-	};
-
-	chosen {
-		zephyr,console = &uart6;
-		zephyr,shell-uart = &uart6;
-	};
-};
-
-&uart6 {
-	status = "okay";
-	current-speed = <115200>;
-
-	pinctrl-0 = <&p13_0_scb6_uart_rx &p13_1_scb6_uart_tx>;
-	pinctrl-names = "default";
-};
diff --git a/boards/infineon/cy8cproto_062_4343w/cy8cproto_062_4343w_defconfig b/boards/infineon/cy8cproto_062_4343w/cy8cproto_062_4343w_defconfig
index 221643eca2791..2bda7847628ab 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 7d0d29ea39cc9..98136255552ab 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 426cd85d30f37..14c8035580030 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 d7dbbde1f7ef5..e08dc5e13ccc6 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 319253378d318..775396fb24579 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