zephyrproject-rtos · nordicjm · Feb 27, 2024 · Feb 23, 2024 · Feb 23, 2024 · Feb 23, 2024
diff --git a/boards/silabs/efr32_radio/Kconfig.defconfig b/boards/silabs/efr32_radio/Kconfig.defconfig
@@ -25,7 +25,7 @@ config LOG_BACKEND_SWO_FREQ_HZ
 if SOC_GECKO_USE_RAIL
 
 config FPU
-	default n if SOC_GECKO_SERIES1
+	default n if SOC_FAMILY_SILABS_S1
 	default y
 
 endif # SOC_GECKO_USE_RAIL

diff --git a/drivers/hwinfo/Kconfig b/drivers/hwinfo/Kconfig
@@ -180,7 +180,7 @@ config HWINFO_PSOC6
 config HWINFO_GECKO
 	bool "GECKO hwinfo"
 	default y
-	depends on SOC_FAMILY_SILABS_EXX32 && !SOC_SERIES_EFR32MG21 && !SOC_SERIES_EFR32BG22
+	depends on SOC_VENDOR_SILABS && !SOC_SERIES_EFR32MG21 && !SOC_SERIES_EFR32BG22
 	select SOC_GECKO_RMU
 	help
 	  Enable Silabs GECKO hwinfo driver.

diff --git a/drivers/pinctrl/pinctrl_gecko.c b/drivers/pinctrl/pinctrl_gecko.c
@@ -12,7 +12,7 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt, uintp
 {
 	USART_TypeDef *base = (USART_TypeDef *)reg;
 	uint8_t loc;
-#ifdef CONFIG_SOC_GECKO_SERIES1
+#ifdef CONFIG_SOC_FAMILY_SILABS_S1
 	LEUART_TypeDef *lebase = (LEUART_TypeDef *)reg;
 #else
 	int usart_num = USART_NUM(base);
@@ -50,7 +50,7 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt, uintp
 					txpin.out);
 			break;
 
-#ifdef CONFIG_SOC_GECKO_SERIES1
+#ifdef CONFIG_SOC_FAMILY_SILABS_S1
 		case GECKO_FUN_UART_RTS:
 			pin_config.mode = gpioModePushPull;
 			pin_config.out = 1;
@@ -100,7 +100,7 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt, uintp
 			lebase->ROUTELOC0 &= ~_LEUART_ROUTELOC0_TXLOC_MASK;
 			lebase->ROUTELOC0 |= (loc << _LEUART_ROUTELOC0_TXLOC_SHIFT);
 			break;
-#else /* CONFIG_SOC_GECKO_SERIES1 */
+#else /* CONFIG_SOC_FAMILY_SILABS_S1 */
 		case GECKO_FUN_UART_LOC:
 #ifdef CONFIG_SOC_GECKO_HAS_INDIVIDUAL_PIN_LOCATION
 			/* For SOCs with configurable pin_cfg locations (set in SOC Kconfig) */
@@ -156,11 +156,11 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt, uintp
 			}
 #endif /* UART_GECKO_HW_FLOW_CONTROL */
 			break;
-#endif /* CONFIG_SOC_GECKO_SERIES1 */
+#endif /* CONFIG_SOC_FAMILY_SILABS_S1 */
 #endif /* CONFIG_UART_GECKO */
 
 #ifdef CONFIG_SPI_GECKO
-#ifdef CONFIG_SOC_GECKO_SERIES1
+#ifdef CONFIG_SOC_FAMILY_SILABS_S1
 		case GECKO_FUN_SPIM_SCK:
 			pin_config.mode = gpioModePushPull;
 			pin_config.out = 1;
@@ -241,7 +241,7 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt, uintp
 			base->ROUTELOC0 |= (loc << _USART_ROUTELOC0_CSLOC_SHIFT);
 			break;
 
-#else /* CONFIG_SOC_GECKO_SERIES1 */
+#else /* CONFIG_SOC_FAMILY_SILABS_S1 */
 		case GECKO_FUN_SPI_SCK:
 			pin_config.mode = gpioModePushPull;
 			pin_config.out = 1;
@@ -274,7 +274,7 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt, uintp
 			GPIO_PinModeSet(pin_config.port, pin_config.pin, pin_config.mode,
 					pin_config.out);
 			break;
-#endif /* CONFIG_SOC_GECKO_SERIES1 */
+#endif /* CONFIG_SOC_FAMILY_SILABS_S1 */
 #endif /* CONFIG_SPI_GECKO */
 
 		default:

diff --git a/drivers/serial/Kconfig.gecko b/drivers/serial/Kconfig.gecko
@@ -10,6 +10,6 @@ config UART_GECKO
 	select SERIAL_HAS_DRIVER
 	select SERIAL_SUPPORT_INTERRUPT
 	select SOC_GECKO_USART
-	select PINCTRL if SOC_GECKO_SERIES1
+	select PINCTRL if SOC_FAMILY_SILABS_S1
 	help
 	  Enable the Gecko uart driver.
diff --git a/drivers/timer/Kconfig.gecko b/drivers/timer/Kconfig.gecko
@@ -3,7 +3,7 @@
 
 config GECKO_BURTC_TIMER
 	bool "SiLabs Gecko BURTC system clock driver"
-	depends on SOC_GECKO_SERIES2
+	depends on SOC_FAMILY_SILABS_S2
 	depends on DT_HAS_SILABS_GECKO_BURTC_ENABLED
 	select SOC_GECKO_BURTC
 	select TICKLESS_CAPABLE

diff --git a/modules/Kconfig.silabs b/modules/Kconfig.silabs
@@ -6,4 +6,4 @@
 config HAS_SILABS_GECKO
 	bool
 	select HAS_CMSIS_CORE
-	depends on SOC_FAMILY_SILABS_EXX32
+	depends on SOC_VENDOR_SILABS
diff --git a/soc/silabs/exx32/CMakeLists.txt → soc/silabs/CMakeLists.txt b/soc/silabs/exx32/CMakeLists.txt → soc/silabs/CMakeLists.txt
@@ -1,4 +1,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 add_subdirectory(common)
-zephyr_include_directories(${SOC_SERIES})
+zephyr_include_directories(${SOC_FAMILY}/${SOC_SERIES})
diff --git a/soc/silabs/exx32/Kconfig → soc/silabs/Kconfig b/soc/silabs/exx32/Kconfig → soc/silabs/Kconfig
@@ -2,34 +2,19 @@
 # Copyright (c) 2018 Gil Benkoe
 # SPDX-License-Identifier: Apache-2.0
 
-config SOC_FAMILY_SILABS_EXX32
+config SOC_VENDOR_SILABS
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select BUILD_OUTPUT_HEX
 
-if SOC_FAMILY_SILABS_EXX32
+if SOC_VENDOR_SILABS
 
-rsource "*/Kconfig"
+rsource "*/*/Kconfig"
 
-config SOC_GECKO_SERIES0
-	bool
-	help
-	  Set if we're building for Gecko Series 0 SoC.
-	  This is equivalent of _SILICON_LABS_32B_SERIES_0 definition in HAL
-	  code.
-
-config SOC_GECKO_SERIES1
-	bool
-	help
-	  Set if we're building for Gecko Series 1 SoC.
-	  This is equivalent of _SILICON_LABS_32B_SERIES_1 definition in HAL
-	  code.
-
-config SOC_GECKO_SERIES2
-	bool
+config SOC_GECKO_SDID
+	int
 	help
-	  Set if we're building for Gecko Series 2 SoC.
-	  This is equivalent of _SILICON_LABS_32B_SERIES_2 definition in HAL
-	  code.
+	  Gecko SDK sometime refere to the chipset using the internal ID. This
+	  entry reflects this ID.
 
 config SOC_GECKO_BURTC
 	bool
@@ -139,7 +124,7 @@ if PM
 config SOC_GECKO_PM_BACKEND_PMGR
 	bool
 	depends on SOC_GECKO_DEV_INIT
-	default y if SOC_GECKO_SERIES2
+	default y if SOC_FAMILY_SILABS_S2
 	help
 	  Implement PM using sl_power_manager service from Gecko SDK
 
@@ -190,7 +175,7 @@ config SOC_GECKO_DEV_INIT
 	  configures DPLLs and manages the Energy Management Unit.
 
 	  Disabling these services may negatively impact counter and timer
-	  routines in EXX32 series SoCs.
+	  routines in Silabs SoCs.
 
 config COUNTER_GECKO_STIMER
 	bool
@@ -337,4 +322,4 @@ config SOC_GECKO_CUSTOM_RADIO_PHY
 	  management, sending and receiving packets on radio phy. User has
 	  to provide the radio_config.c and radio_config.h files for the phy.
 
-endif # SOC_FAMILY_SILABS_EXX32
+endif # SOC_VENDOR_SILABS
diff --git a/soc/silabs/exx32/Kconfig.defconfig → soc/silabs/Kconfig.defconfig b/soc/silabs/exx32/Kconfig.defconfig → soc/silabs/Kconfig.defconfig
@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_FAMILY_SILABS_EXX32
+if SOC_VENDOR_SILABS
 
-rsource "*/Kconfig.defconfig"
+rsource "*/*/Kconfig.defconfig"
 
 config SOC_GECKO_EMU
 	default y

diff --git a/soc/silabs/Kconfig.soc b/soc/silabs/Kconfig.soc
@@ -0,0 +1,12 @@
+# Copyright (c) 2017 Christian Taedcke
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_VENDOR_SILABS
+	bool
+
+config SOC_FAMILY
+	default "silabs_s0" if SOC_FAMILY_SILABS_S0
+	default "silabs_s1" if SOC_FAMILY_SILABS_S1
+	default "silabs_s2" if SOC_FAMILY_SILABS_S2
+
+rsource "*/Kconfig.soc"
diff --git a/soc/silabs/exx32/common/CMakeLists.txt → soc/silabs/common/CMakeLists.txt b/soc/silabs/exx32/common/CMakeLists.txt → soc/silabs/common/CMakeLists.txt
diff --git a/soc/silabs/exx32/common/pinctrl_soc.h → soc/silabs/common/pinctrl_soc.h b/soc/silabs/exx32/common/pinctrl_soc.h → soc/silabs/common/pinctrl_soc.h
@@ -15,7 +15,7 @@
 #include <stdint.h>
 
 #include <zephyr/devicetree.h>
-#if CONFIG_SOC_GECKO_SERIES1
+#if CONFIG_SOC_FAMILY_SILABS_S1
 #include <zephyr/dt-bindings/pinctrl/gecko-pinctrl-s1.h>
 #else
 #include <zephyr/dt-bindings/pinctrl/gecko-pinctrl.h>

diff --git a/...exx32/common/sl_device_init_hfxo_config.h → ...ilabs/common/sl_device_init_hfxo_config.h b/...exx32/common/sl_device_init_hfxo_config.h → ...ilabs/common/sl_device_init_hfxo_config.h
diff --git a/soc/silabs/exx32/common/soc.c → soc/silabs/common/soc.c b/soc/silabs/exx32/common/soc.c → soc/silabs/common/soc.c
@@ -6,7 +6,7 @@
 
 /**
  * @file
- * @brief Common SoC initialization for the EXX32
+ * @brief Common SoC initialization for the Silabs products
  */
 
 #include <zephyr/init.h>
@@ -206,7 +206,7 @@ static void swo_init(void)
  *
  * @return 0
  */
-static int silabs_exx32_init(void)
+static int silabs_init(void)
 {
 	/* handle chip errata */
 	CHIP_Init();
@@ -244,4 +244,4 @@ static int silabs_exx32_init(void)
 	return 0;
 }
 
-SYS_INIT(silabs_exx32_init, PRE_KERNEL_1, 0);
+SYS_INIT(silabs_init, PRE_KERNEL_1, 0);
diff --git a/soc/silabs/exx32/common/soc_gpio.h → soc/silabs/common/soc_gpio.h b/soc/silabs/exx32/common/soc_gpio.h → soc/silabs/common/soc_gpio.h
@@ -4,12 +4,12 @@
  */
 
 /** @file
- * @brief Silabs EXX32 MCU family General Purpose Input Output (GPIO)
+ * @brief Silabs MCU family General Purpose Input Output (GPIO)
  * module HAL driver.
  */
 
-#ifndef _SILABS_EXX32_SOC_GPIO_H_
-#define _SILABS_EXX32_SOC_GPIO_H_
+#ifndef _SILABS_COMMON_SOC_GPIO_H_
+#define _SILABS_COMMON_SOC_GPIO_H_
 
 #include <soc.h>
 #include <em_gpio.h>
@@ -29,4 +29,4 @@ struct soc_gpio_pin {
 }
 #endif
 
-#endif /* _SILABS_EXX32_SOC_GPIO_H_ */
+#endif /* _SILABS_COMMON_SOC_GPIO_H_ */
diff --git a/soc/silabs/exx32/common/soc_power.c → soc/silabs/common/soc_power.c b/soc/silabs/exx32/common/soc_power.c → soc/silabs/common/soc_power.c
diff --git a/soc/silabs/exx32/common/soc_power_pmgr.c → soc/silabs/common/soc_power_pmgr.c b/soc/silabs/exx32/common/soc_power_pmgr.c → soc/silabs/common/soc_power_pmgr.c
diff --git a/soc/silabs/exx32/efm32gg11b/Kconfig.defconfig.efm32gg11b b/soc/silabs/exx32/efm32gg11b/Kconfig.defconfig.efm32gg11b
diff --git a/soc/silabs/exx32/efm32gg12b/Kconfig.defconfig.efm32gg12b b/soc/silabs/exx32/efm32gg12b/Kconfig.defconfig.efm32gg12b
diff --git a/soc/silabs/exx32/efr32bg22/Kconfig.defconfig.efr32bg22 b/soc/silabs/exx32/efr32bg22/Kconfig.defconfig.efr32bg22
diff --git a/soc/silabs/exx32/efr32bg27/Kconfig.defconfig.efr32bg27 b/soc/silabs/exx32/efr32bg27/Kconfig.defconfig.efr32bg27
diff --git a/soc/silabs/exx32/efr32mg21/Kconfig.defconfig.efr32mg21 b/soc/silabs/exx32/efr32mg21/Kconfig.defconfig.efr32mg21
diff --git a/soc/silabs/exx32/Kconfig.soc → soc/silabs/silabs_s0/Kconfig.soc b/soc/silabs/exx32/Kconfig.soc → soc/silabs/silabs_s0/Kconfig.soc
@@ -1,10 +1,8 @@
 # Copyright (c) 2017 Christian Taedcke
 # SPDX-License-Identifier: Apache-2.0
 
-config SOC_FAMILY_SILABS_EXX32
+config SOC_FAMILY_SILABS_S0
 	bool
-
-config SOC_FAMILY
-	default "silabs_exx32" if SOC_FAMILY_SILABS_EXX32
+	select SOC_VENDOR_SILABS
 
 rsource "*/Kconfig.soc"
diff --git a/soc/silabs/exx32/efm32hg/Kconfig → soc/silabs/silabs_s0/efm32hg/Kconfig b/soc/silabs/exx32/efm32hg/Kconfig → soc/silabs/silabs_s0/efm32hg/Kconfig
@@ -12,4 +12,6 @@ config SOC_SERIES_EFM32HG
 	select SOC_GECKO_CMU
 	select SOC_GECKO_GPIO
 	select HAS_PM
-	select SOC_GECKO_SERIES0
+
+config SOC_GECKO_SDID
+	default 77 if SOC_SERIES_EFM32HG
diff --git a/soc/silabs/exx32/efm32hg/Kconfig.defconfig → ...ilabs/silabs_s0/efm32hg/Kconfig.defconfig b/soc/silabs/exx32/efm32hg/Kconfig.defconfig → ...ilabs/silabs_s0/efm32hg/Kconfig.defconfig
diff --git a/soc/silabs/exx32/efm32hg/Kconfig.soc → soc/silabs/silabs_s0/efm32hg/Kconfig.soc b/soc/silabs/exx32/efm32hg/Kconfig.soc → soc/silabs/silabs_s0/efm32hg/Kconfig.soc
@@ -5,7 +5,7 @@
 
 config SOC_SERIES_EFM32HG
 	bool
-	select SOC_FAMILY_SILABS_EXX32
+	select SOC_FAMILY_SILABS_S0
 	help
 	  EFM32HG Series MCU
 

diff --git a/soc/silabs/exx32/efm32hg/soc.h → soc/silabs/silabs_s0/efm32hg/soc.h b/soc/silabs/exx32/efm32hg/soc.h → soc/silabs/silabs_s0/efm32hg/soc.h
diff --git a/soc/silabs/exx32/efm32hg/soc_pinmap.h → soc/silabs/silabs_s0/efm32hg/soc_pinmap.h b/soc/silabs/exx32/efm32hg/soc_pinmap.h → soc/silabs/silabs_s0/efm32hg/soc_pinmap.h
diff --git a/soc/silabs/exx32/efm32wg/Kconfig → soc/silabs/silabs_s0/efm32wg/Kconfig b/soc/silabs/exx32/efm32wg/Kconfig → soc/silabs/silabs_s0/efm32wg/Kconfig
@@ -13,4 +13,6 @@ config SOC_SERIES_EFM32WG
 	select SOC_GECKO_CMU
 	select SOC_GECKO_GPIO
 	select HAS_PM
-	select SOC_GECKO_SERIES0
+
+config SOC_GECKO_SDID
+	default 74 if SOC_SERIES_EFM32WG
diff --git a/soc/silabs/exx32/efm32wg/Kconfig.defconfig → ...ilabs/silabs_s0/efm32wg/Kconfig.defconfig b/soc/silabs/exx32/efm32wg/Kconfig.defconfig → ...ilabs/silabs_s0/efm32wg/Kconfig.defconfig
diff --git a/soc/silabs/exx32/efm32wg/Kconfig.soc → soc/silabs/silabs_s0/efm32wg/Kconfig.soc b/soc/silabs/exx32/efm32wg/Kconfig.soc → soc/silabs/silabs_s0/efm32wg/Kconfig.soc
@@ -5,7 +5,7 @@
 
 config SOC_SERIES_EFM32WG
 	bool
-	select SOC_FAMILY_SILABS_EXX32
+	select SOC_FAMILY_SILABS_S0
 	help
 	  EFM32WG Series MCU
 

diff --git a/soc/silabs/exx32/efm32wg/soc.h → soc/silabs/silabs_s0/efm32wg/soc.h b/soc/silabs/exx32/efm32wg/soc.h → soc/silabs/silabs_s0/efm32wg/soc.h
diff --git a/soc/silabs/exx32/efm32wg/soc_pinmap.h → soc/silabs/silabs_s0/efm32wg/soc_pinmap.h b/soc/silabs/exx32/efm32wg/soc_pinmap.h → soc/silabs/silabs_s0/efm32wg/soc_pinmap.h
diff --git a/soc/silabs/silabs_s1/Kconfig.soc b/soc/silabs/silabs_s1/Kconfig.soc
@@ -0,0 +1,8 @@
+# Copyright (c) 2017 Christian Taedcke
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_FAMILY_SILABS_S1
+	bool
+	select SOC_VENDOR_SILABS
+
+rsource "*/Kconfig.soc"
diff --git a/soc/silabs/exx32/efm32gg11b/Kconfig → soc/silabs/silabs_s1/efm32gg11b/Kconfig b/soc/silabs/exx32/efm32gg11b/Kconfig → soc/silabs/silabs_s1/efm32gg11b/Kconfig
@@ -16,4 +16,6 @@ config SOC_SERIES_EFM32GG11B
 	select SOC_GECKO_EMU
 	select SOC_GECKO_GPIO
 	select SOC_GECKO_TRNG
-	select SOC_GECKO_SERIES1
+
+config SOC_GECKO_SDID
+	default 100 if SOC_SERIES_EFM32GG11B
diff --git a/...silabs/exx32/efm32gg11b/Kconfig.defconfig → ...bs/silabs_s1/efm32gg11b/Kconfig.defconfig b/...silabs/exx32/efm32gg11b/Kconfig.defconfig → ...bs/silabs_s1/efm32gg11b/Kconfig.defconfig
@@ -10,6 +10,8 @@ config NUM_IRQS
 	# must be >= the highest interrupt number used
 	default 68
 
-rsource "Kconfig.defconfig.efm32gg11b"
+config GPIO_GECKO
+	default y
+	depends on GPIO || LOG_BACKEND_SWO
 
 endif # SOC_SERIES_EFM32GG11B
diff --git a/soc/silabs/exx32/efm32gg11b/Kconfig.soc → soc/silabs/silabs_s1/efm32gg11b/Kconfig.soc b/soc/silabs/exx32/efm32gg11b/Kconfig.soc → soc/silabs/silabs_s1/efm32gg11b/Kconfig.soc
@@ -5,7 +5,7 @@
 
 config SOC_SERIES_EFM32GG11B
 	bool
-	select SOC_FAMILY_SILABS_EXX32
+	select SOC_FAMILY_SILABS_S1
 	help
 	  EFM32GG11B Series MCU
 

diff --git a/soc/silabs/exx32/efm32gg11b/soc.h → soc/silabs/silabs_s1/efm32gg11b/soc.h b/soc/silabs/exx32/efm32gg11b/soc.h → soc/silabs/silabs_s1/efm32gg11b/soc.h
diff --git a/soc/silabs/exx32/efm32gg11b/soc_pinmap.h → soc/silabs/silabs_s1/efm32gg11b/soc_pinmap.h b/soc/silabs/exx32/efm32gg11b/soc_pinmap.h → soc/silabs/silabs_s1/efm32gg11b/soc_pinmap.h
diff --git a/soc/silabs/exx32/efm32gg12b/Kconfig → soc/silabs/silabs_s1/efm32gg12b/Kconfig b/soc/silabs/exx32/efm32gg12b/Kconfig → soc/silabs/silabs_s1/efm32gg12b/Kconfig
@@ -15,4 +15,6 @@ config SOC_SERIES_EFM32GG12B
 	select SOC_GECKO_EMU
 	select SOC_GECKO_GPIO
 	select SOC_GECKO_TRNG
-	select SOC_GECKO_SERIES1
+
+config SOC_GECKO_SDID
+	default 106 if SOC_SERIES_EFM32GG12B
diff --git a/...silabs/exx32/efm32gg12b/Kconfig.defconfig → ...bs/silabs_s1/efm32gg12b/Kconfig.defconfig b/...silabs/exx32/efm32gg12b/Kconfig.defconfig → ...bs/silabs_s1/efm32gg12b/Kconfig.defconfig
@@ -9,6 +9,8 @@ config NUM_IRQS
 	# must be >= the highest interrupt number used
 	default 68
 
-rsource "Kconfig.defconfig.efm32gg12b"
+config GPIO_GECKO
+	default y
+	depends on GPIO || LOG_BACKEND_SWO
 
 endif # SOC_SERIES_EFM32GG12B