soc: st: stm32: Migrate STM32WBA series

Port STM32WBA series to HW model v2

Signed-off-by: Guillaume Gautier <guillaume.gautier-ext@st.com>

soc/soc_legacy/arm/st_stm32/stm32wba/Kconfig.soc

@@ -1,16 +0,0 @@
-# ST Microelectronics STM32WBA MCU line
-
-# Copyright (c) 2023 STMicroelectronics
-# SPDX-License-Identifier: Apache-2.0
-
-choice
-prompt "STM32WBAx MCU Selection"
-depends on SOC_SERIES_STM32WBAX
-
-config SOC_STM32WBA52XX
-	bool "STM32WBA52XX"
-
-config SOC_STM32WBA55XX
-	bool "STM32WBA55XX"
-
-endchoice

soc/st/stm32/Kconfig

@@ -42,7 +42,8 @@ config STM32_ENABLE_DEBUG_SLEEP_STOP
 choice POWER_SUPPLY_CHOICE
 	prompt "STM32 power supply configuration"
 	default POWER_SUPPLY_LDO
-	depends on SOC_SERIES_STM32H7X || SOC_SERIES_STM32U5X
+	depends on SOC_SERIES_STM32H7X || SOC_SERIES_STM32U5X || \
+		   SOC_STM32WBA55XX
 
 config POWER_SUPPLY_LDO
 	bool "LDO supply"
@@ -52,31 +53,31 @@ config POWER_SUPPLY_DIRECT_SMPS
 
 config POWER_SUPPLY_SMPS_1V8_SUPPLIES_LDO
 	bool "SMPS 1.8V supplies LDO (no external supply)"
-	depends on !SOC_SERIES_STM32U5X
+	depends on SOC_SERIES_STM32H7X
 
 config POWER_SUPPLY_SMPS_2V5_SUPPLIES_LDO
 	bool "SMPS 2.5V supplies LDO (no external supply)"
-	depends on !SOC_SERIES_STM32U5X
+	depends on SOC_SERIES_STM32H7X
 
 config POWER_SUPPLY_SMPS_1V8_SUPPLIES_EXT_AND_LDO
 	bool "External SMPS 1.8V supply, supplies LDO"
-	depends on !SOC_SERIES_STM32U5X
+	depends on SOC_SERIES_STM32H7X
 
 config POWER_SUPPLY_SMPS_2V5_SUPPLIES_EXT_AND_LDO
 	bool "External SMPS 2.5V supply, supplies LDO"
-	depends on !SOC_SERIES_STM32U5X
+	depends on SOC_SERIES_STM32H7X
 
 config POWER_SUPPLY_SMPS_1V8_SUPPLIES_EXT
 	bool "External SMPS 1.8V supply and bypass"
-	depends on !SOC_SERIES_STM32U5X
+	depends on SOC_SERIES_STM32H7X
 
 config POWER_SUPPLY_SMPS_2V5_SUPPLIES_EXT
 	bool "External SMPS 2.5V supply and bypass"
-	depends on !SOC_SERIES_STM32U5X
+	depends on SOC_SERIES_STM32H7X
 
 config POWER_SUPPLY_EXTERNAL_SOURCE
 	bool "Bypass"
-	depends on !SOC_SERIES_STM32U5X
+	depends on SOC_SERIES_STM32H7X
 
 endchoice
 

soc/st/stm32/soc.yml

@@ -176,6 +176,10 @@ family:
   - name: stm32wbx
     socs:
     - name: stm32wb55xx
+  - name: stm32wbax
+    socs:
+    - name: stm32wba52xx
+    - name: stm32wba55xx
   - name: stm32wlx
     socs:
     - name: stm32wle4xx

soc/st/stm32/stm32wba/CMakeLists.txt

@@ -19,4 +19,6 @@ if(CONFIG_BT_STM32WBA)
   zephyr_sources(hci_if/stm32_timer.c)
 endif()
 
+zephyr_include_directories(.)
+
 set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")

soc/st/stm32/stm32wba/Kconfig

@@ -4,10 +4,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config SOC_SERIES_STM32WBAX
-	bool "STM32WBAx Series MCU"
 	select ARM
 	select CPU_CORTEX_M33
-	select SOC_FAMILY_STM32
 	select ARM_TRUSTZONE_M
 	select CPU_HAS_ARM_SAU
 	select CPU_HAS_ARM_MPU
@@ -17,5 +15,3 @@ config SOC_SERIES_STM32WBAX
 	select HAS_STM32CUBE
 	select USE_STM32_HAL_PWR_EX
 	select HAS_PM
-	help
-	  Enable support for STM32WBA MCU series

soc/st/stm32/stm32wba/Kconfig.defconfig

@@ -5,10 +5,7 @@
 
 if SOC_SERIES_STM32WBAX
 
-source "soc/soc_legacy/arm/st_stm32/stm32wba/Kconfig.defconfig.stm32wba*"
-
-config SOC_SERIES
-	default "stm32wba"
+rsource "Kconfig.defconfig.stm32wba*"
 
 config STM32_LPTIM_TIMER
 	default y if PM

soc/st/stm32/stm32wba/Kconfig.defconfig.stm32wba52xx

@@ -5,9 +5,6 @@
 
 if SOC_STM32WBA52XX
 
-config SOC
-	default "stm32wba52xx"
-
 config NUM_IRQS
 	default 70
 

soc/st/stm32/stm32wba/Kconfig.defconfig.stm32wba55xx

@@ -5,9 +5,6 @@
 
 if SOC_STM32WBA55XX
 
-config SOC
-	default "stm32wba55xx"
-
 config NUM_IRQS
 	default 70
 

soc/st/stm32/stm32wba/Kconfig.soc

@@ -0,0 +1,23 @@
+# ST Microelectronics STM32WBA MCU line
+
+# Copyright (c) 2023 STMicroelectronics
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_SERIES_STM32WBAX
+	bool
+	select SOC_FAMILY_STM32
+
+config SOC_SERIES
+	default "stm32wba" if SOC_SERIES_STM32WBAX
+
+config SOC_STM32WBA52XX
+	bool
+	select SOC_SERIES_STM32WBAX
+
+config SOC_STM32WBA55XX
+	bool
+	select SOC_SERIES_STM32WBAX
+
+config SOC
+	default "stm32wba52xx" if SOC_STM32WBA52XX
+	default "stm32wba55xx" if SOC_STM32WBA55XX