soc: st: stm32: wba: replace Kconfig power supply configuration with DT

mathieuchopstm · mathieuchopstm · commit 3cb069722a04 · 2025-11-12T14:03:42.000+01:00
Replace the existing infrastructure to specify power supply configuration
through Kconfig with Devicetree, and update all boards according to new
mechanism.

Signed-off-by: Mathieu Choplain &lt;mathieu.choplain-ext@st.com&gt;
diff --git a/boards/st/nucleo_wba55cg/nucleo_wba55cg.dts b/boards/st/nucleo_wba55cg/nucleo_wba55cg.dts
@@ -112,6 +112,10 @@
 	apb7-prescaler = <1>;
 };
 
+&pwr {
+	power-supply = "smps";
+};
+
 &iwdg {
 	status = "okay";
 };
diff --git a/boards/st/nucleo_wba55cg/nucleo_wba55cg_defconfig b/boards/st/nucleo_wba55cg/nucleo_wba55cg_defconfig
@@ -16,6 +16,3 @@ CONFIG_ARM_MPU=y
 
 # Enable HW stack protection
 CONFIG_HW_STACK_PROTECTION=y
-
-# Enable the internal SMPS regulator
-CONFIG_POWER_SUPPLY_DIRECT_SMPS=y
diff --git a/boards/st/nucleo_wba65ri/nucleo_wba65ri.dts b/boards/st/nucleo_wba65ri/nucleo_wba65ri.dts
@@ -101,6 +101,10 @@
 	apb7-prescaler = <1>;
 };
 
+&pwr {
+	power-supply = "smps";
+};
+
 &iwdg {
 	status = "okay";
 };
diff --git a/boards/st/nucleo_wba65ri/nucleo_wba65ri_defconfig b/boards/st/nucleo_wba65ri/nucleo_wba65ri_defconfig
@@ -19,6 +19,3 @@ CONFIG_ARM_MPU=y
 
 # Enable HW stack protection
 CONFIG_HW_STACK_PROTECTION=y
-
-# Enable the internal SMPS regulator
-CONFIG_POWER_SUPPLY_DIRECT_SMPS=y
diff --git a/boards/st/nucleo_wba65ri/nucleo_wba65ri_stm32wba65xx_ns_defconfig b/boards/st/nucleo_wba65ri/nucleo_wba65ri_stm32wba65xx_ns_defconfig
@@ -17,9 +17,6 @@ CONFIG_ARM_MPU=y
 # Enable HW stack protection
 CONFIG_HW_STACK_PROTECTION=y
 
-# Enable the internal SMPS regulator
-CONFIG_POWER_SUPPLY_DIRECT_SMPS=y
-
 # Header offset since TF-M has no BL2 hence Zephyr is not signed
 CONFIG_ROM_START_OFFSET=0x400
 
diff --git a/boards/st/stm32wba65i_dk1/stm32wba65i_dk1.dts b/boards/st/stm32wba65i_dk1/stm32wba65i_dk1.dts
@@ -109,6 +109,10 @@
 	apb7-prescaler = <1>;
 };
 
+&pwr {
+	power-supply = "smps";
+};
+
 &iwdg {
 	status = "okay";
 };
diff --git a/boards/st/stm32wba65i_dk1/stm32wba65i_dk1_defconfig b/boards/st/stm32wba65i_dk1/stm32wba65i_dk1_defconfig
@@ -17,8 +17,5 @@ CONFIG_ARM_MPU=y
 # Enable HW stack protection
 CONFIG_HW_STACK_PROTECTION=y
 
-# Enable the internal SMPS regulator
-CONFIG_POWER_SUPPLY_DIRECT_SMPS=y
-
 # Enable ADC for joystick
 CONFIG_ADC=y
diff --git a/boards/st/stm32wba65i_dk1/stm32wba65i_dk1_stm32wba65xx_ns_defconfig b/boards/st/stm32wba65i_dk1/stm32wba65i_dk1_stm32wba65xx_ns_defconfig
@@ -17,9 +17,6 @@ CONFIG_ARM_MPU=y
 # Enable HW stack protection
 CONFIG_HW_STACK_PROTECTION=y
 
-# Enable the internal SMPS regulator
-CONFIG_POWER_SUPPLY_DIRECT_SMPS=y
-
 # Enable ADC for joystick
 CONFIG_ADC=y
 
diff --git a/dts/arm/st/wba/stm32wba.dtsi b/dts/arm/st/wba/stm32wba.dtsi
@@ -165,7 +165,7 @@
 		};
 
 		pwr: power@46020800 {
-			compatible = "st,stm32-pwr";
+			compatible = "st,stm32-dualreg-pwr", "st,stm32-pwr";
 			reg = <0x46020800 0x400>;
 			wkup-pins-nb = <8>;
 			wkup-pin-srcs = <2>;
diff --git a/soc/st/stm32/Kconfig b/soc/st/stm32/Kconfig
@@ -75,19 +75,6 @@ config STM32_WKUP_PINS
 	help
 	  Enable support for STM32 PWR wake-up pins.
 
-choice POWER_SUPPLY_CHOICE
-	prompt "STM32 power supply configuration"
-	default POWER_SUPPLY_LDO
-	depends on SOC_STM32WBA55XX || SOC_STM32WBA65XX
-
-config POWER_SUPPLY_LDO
-	bool "LDO supply"
-
-config POWER_SUPPLY_DIRECT_SMPS
-	bool "Direct SMPS supply"
-
-endchoice
-
 config STM32_BACKUP_PROTECTION
 	bool "SoC has backup domain protection access"
 	help
diff --git a/soc/st/stm32/stm32wbax/soc.c b/soc/st/stm32/stm32wbax/soc.c
@@ -24,6 +24,17 @@
 #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
 LOG_MODULE_REGISTER(soc);
 
+#define PWR_NODE DT_INST(0, st_stm32_pwr)
+
+/* Helper to simplify following #if chain */
+#define SELECTED_PSU(_x) DT_ENUM_HAS_VALUE(PWR_NODE, power_supply, _x)
+
+#if SELECTED_PSU(ldo)
+#define SELECTED_POWER_SUPPLY LL_PWR_LDO_SUPPLY
+#elif SELECTED_PSU(smps)
+#define SELECTED_POWER_SUPPLY LL_PWR_SMPS_SUPPLY
+#endif
+
 /**
  * @brief Perform basic hardware initialization at boot.
  *
@@ -43,11 +54,7 @@ void stm32wba_init(void)
 	/* Enable PWR */
 	LL_AHB4_GRP1_EnableClock(LL_AHB4_GRP1_PERIPH_PWR);
 
-#if defined(CONFIG_POWER_SUPPLY_DIRECT_SMPS)
-	LL_PWR_SetRegulatorSupply(LL_PWR_SMPS_SUPPLY);
-#elif defined(CONFIG_POWER_SUPPLY_LDO)
-	LL_PWR_SetRegulatorSupply(LL_PWR_LDO_SUPPLY);
-#endif
+	LL_PWR_SetRegulatorSupply(SELECTED_POWER_SUPPLY);
 }
 
 void soc_early_init_hook(void)
