soc: silabs: silabs_s2: EFR series 2 devices Kconfig updates for gpio

fimohame · fimohame · commit 5b141f93a62a · 2025-07-23T23:58:34.000+05:30
Added the Kconfig changes for EFR series 2 devices.
Updated the pinctrl_silabs_dbus.c with sl_hal_gpio apis

Signed-off-by: S Mohamed Fiaz &lt;fiaz.mohamed@silabs.com&gt;
diff --git a/drivers/pinctrl/pinctrl_silabs_dbus.c b/drivers/pinctrl/pinctrl_silabs_dbus.c
@@ -7,7 +7,7 @@
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/arch/cpu.h>
 
-#include <em_gpio.h>
+#include <sl_hal_gpio.h>
 
 #define DT_DRV_COMPAT silabs_dbus_pinctrl
 #define PIN_MASK      0xF0000UL
@@ -34,7 +34,11 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt, uintp
 		}
 
 		/* Configure GPIO */
-		GPIO_PinModeSet(pins[i].port, pins[i].pin, pins[i].mode, pins[i].dout);
+		sl_gpio_t gpio = {
+			.port = pins[i].port,
+			.pin = pins[i].pin,
+		};
+		sl_hal_gpio_set_pin_mode(&gpio, pins[i].mode, pins[i].dout);
 
 		/* Configure DBUS */
 		enable_reg = DT_INST_REG_ADDR_BY_NAME(0, dbus) +
@@ -46,7 +50,7 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt, uintp
 		}
 
 		if (pins[i].en_bit != SILABS_PINCTRL_UNUSED) {
-			if (pins[i].mode == gpioModeDisabled) {
+			if (pins[i].mode == SL_GPIO_MODE_DISABLED) {
 				sys_clear_bit(enable_reg, pins[i].en_bit);
 			} else {
 				sys_set_bit(enable_reg, pins[i].en_bit);
diff --git a/soc/silabs/Kconfig b/soc/silabs/Kconfig
@@ -131,6 +131,11 @@ config SOC_GECKO_TRNG
 	help
 	  Set if the SoC has a True Random Number Generator (TRNG) module.
 
+config SOC_SILABS_SISDK_GPIO
+	bool
+	help
+	  Set if the General Purpose Input/Output (GPIO) HAL module is used.
+
 config SOC_SILABS_SLEEPTIMER
 	bool
 	select SOC_GECKO_PRS
diff --git a/soc/silabs/silabs_s2/efr32bg22/Kconfig b/soc/silabs/silabs_s2/efr32bg22/Kconfig
@@ -12,7 +12,7 @@ config SOC_SERIES_EFR32BG22
 	select HAS_SILABS_SISDK
 	select HAS_SWO
 	select SOC_GECKO_HAS_RADIO
-	select SOC_GECKO_GPIO
+	select SOC_SILABS_SISDK_GPIO
 	select SOC_GECKO_CMU
 	select SOC_GECKO_CORE
 	select SOC_GECKO_DEV_INIT
diff --git a/soc/silabs/silabs_s2/efr32bg22/Kconfig.defconfig b/soc/silabs/silabs_s2/efr32bg22/Kconfig.defconfig
@@ -10,7 +10,4 @@ config NUM_IRQS
 config PM
 	select UART_INTERRUPT_DRIVEN
 
-config GPIO_GECKO
-	default y
-
 endif
diff --git a/soc/silabs/silabs_s2/efr32bg27/Kconfig b/soc/silabs/silabs_s2/efr32bg27/Kconfig
@@ -12,6 +12,7 @@ config SOC_SERIES_EFR32BG27
 	select HAS_SILABS_SISDK
 	select HAS_SWO
 	select SOC_GECKO_HAS_RADIO
+	select SOC_SILABS_SISDK_GPIO
 	select SOC_GECKO_CMU
 	select SOC_GECKO_CORE
 	select SOC_GECKO_DEV_INIT
diff --git a/soc/silabs/silabs_s2/efr32bg27/Kconfig.defconfig b/soc/silabs/silabs_s2/efr32bg27/Kconfig.defconfig
@@ -7,7 +7,4 @@ config NUM_IRQS
 	# must be >= the highest interrupt number used
 	default 66
 
-config GPIO_GECKO
-	default y
-
 endif
diff --git a/soc/silabs/silabs_s2/efr32mg21/Kconfig b/soc/silabs/silabs_s2/efr32mg21/Kconfig
@@ -15,7 +15,7 @@ config SOC_SERIES_EFR32MG21
 	select HAS_SWO
 	select SOC_GECKO_CMU
 	select SOC_GECKO_EMU
-	select SOC_GECKO_GPIO
+	select SOC_SILABS_SISDK_GPIO
 	select SOC_GECKO_DEV_INIT
 	select SOC_GECKO_SE
 	select HAS_PM
diff --git a/soc/silabs/silabs_s2/efr32mg21/Kconfig.defconfig b/soc/silabs/silabs_s2/efr32mg21/Kconfig.defconfig
@@ -11,8 +11,4 @@ config PM
 	select COUNTER
 	select UART_INTERRUPT_DRIVEN
 
-config GPIO_GECKO
-	default y
-	depends on GPIO || LOG_BACKEND_SWO
-
 endif
diff --git a/soc/silabs/silabs_s2/efr32mg21/soc_pinmap.h b/soc/silabs/silabs_s2/efr32mg21/soc_pinmap.h
diff --git a/soc/silabs/silabs_s2/efr32zg23/Kconfig b/soc/silabs/silabs_s2/efr32zg23/Kconfig
@@ -17,7 +17,7 @@ config SOC_SERIES_EFR32ZG23
 	select SOC_GECKO_CORE
 	select SOC_GECKO_DEV_INIT
 	select SOC_GECKO_EMU
-	select SOC_GECKO_GPIO
+	select SOC_SILABS_SISDK_GPIO
 	select SOC_GECKO_HAS_RADIO
 	select SOC_GECKO_SE
 
diff --git a/soc/silabs/silabs_s2/efr32zg23/Kconfig.defconfig b/soc/silabs/silabs_s2/efr32zg23/Kconfig.defconfig
@@ -10,7 +10,4 @@ config NUM_IRQS
 config PM
 	select UART_INTERRUPT_DRIVEN
 
-config GPIO_GECKO
-	default y
-
 endif
diff --git a/soc/silabs/silabs_s2/xg24/Kconfig b/soc/silabs/silabs_s2/xg24/Kconfig
@@ -16,7 +16,7 @@ config SOC_SERIES_EFR32MG24
 	select HAS_SWO
 	select SOC_GECKO_CMU
 	select SOC_GECKO_EMU
-	select SOC_GECKO_GPIO
+	select SOC_SILABS_SISDK_GPIO
 	select SOC_GECKO_DEV_INIT
 	select SOC_GECKO_SE
 	select HAS_PM
@@ -35,7 +35,7 @@ config SOC_SERIES_MGM24
 	select HAS_SWO
 	select SOC_GECKO_CMU
 	select SOC_GECKO_EMU
-	select SOC_GECKO_GPIO
+	select SOC_SILABS_SISDK_GPIO
 	select SOC_GECKO_DEV_INIT
 	select SOC_GECKO_SE
 	select HAS_PM
diff --git a/soc/silabs/silabs_s2/xg24/soc_pinmap.h b/soc/silabs/silabs_s2/xg24/soc_pinmap.h
diff --git a/soc/silabs/silabs_s2/xg29/Kconfig b/soc/silabs/silabs_s2/xg29/Kconfig
@@ -15,7 +15,7 @@ config SOC_SERIES_EFR32BG29
 	select HAS_SWO
 	select SOC_GECKO_CMU
 	select SOC_GECKO_EMU
-	select SOC_GECKO_GPIO
+	select SOC_SILABS_SISDK_GPIO
 	select SOC_GECKO_DEV_INIT
 	select SOC_GECKO_SE
 	select HAS_PM
@@ -34,7 +34,7 @@ config SOC_SERIES_EFR32MG29
 	select HAS_SWO
 	select SOC_GECKO_CMU
 	select SOC_GECKO_EMU
-	select SOC_GECKO_GPIO
+	select SOC_SILABS_SISDK_GPIO
 	select SOC_GECKO_DEV_INIT
 	select SOC_GECKO_SE
 	select HAS_PM
