stm32mp1: board: Update the way vdd-supply is retrieved from DT

Due to kernel DT alignment, pwr-supply is renamed to vdd-supply
and is a subnode of pwr-regulators.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>

diff --git a/arch/arm/dts/stm32mp157a-avenger96.dts b/arch/arm/dts/stm32mp157a-avenger96.dts
index ba86cf5..5b15a4a 100644 (file)
--- a/arch/arm/dts/stm32mp157a-avenger96.dts
+++ b/arch/arm/dts/stm32mp157a-avenger96.dts
@@ -283,7 +283,10 @@
 };
 
 &pwr {
-       pwr-supply = <&vdd>;
+       pwr-regulators {
+               vdd-supply = <&vdd>;
+               vdd_3v3_usbfs-supply = <&vdd_usb>;
+       };
 };
 
 &rng1 {

diff --git a/arch/arm/dts/stm32mp157a-dk1.dts b/arch/arm/dts/stm32mp157a-dk1.dts
index 1d5c1a6..ba612a5 100644 (file)
--- a/arch/arm/dts/stm32mp157a-dk1.dts
+++ b/arch/arm/dts/stm32mp157a-dk1.dts
@@ -308,7 +308,10 @@
 };
 
 &pwr {
-       pwr-supply = <&vdd>;
+       pwr-regulators {
+               vdd-supply = <&vdd>;
+               vdd_3v3_usbfs-supply = <&vdd_usb>;
+       };
 };
 
 &rng1 {

diff --git a/arch/arm/dts/stm32mp157c-ed1.dts b/arch/arm/dts/stm32mp157c-ed1.dts
index 94ac025..3e8b7b5 100644 (file)
--- a/arch/arm/dts/stm32mp157c-ed1.dts
+++ b/arch/arm/dts/stm32mp157c-ed1.dts
@@ -218,7 +218,10 @@
 };
 
 &pwr {
-       pwr-supply = <&vdd>;
+       pwr-regulators {
+               vdd-supply = <&vdd>;
+               vdd_3v3_usbfs-supply = <&vdd_usb>;
+       };
 };
 
 &rng1 {

diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index 1be1160..1f6ee3f 100644 (file)
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -472,7 +472,9 @@ static void sysconf_init(void)
         *   => U-Boot set the register only if VDD < 2.7V (in DT)
         *      but this value need to be consistent with board design
         */
-       ret = syscon_get_by_driver_data(STM32MP_SYSCON_PWR, &pwr_dev);
+       ret = uclass_get_device_by_driver(UCLASS_PMIC,
+                                         DM_GET_DRIVER(stm32mp_pwr_pmic),
+                                         &pwr_dev);
        if (!ret) {
                ret = uclass_get_device_by_driver(UCLASS_MISC,
                                                  DM_GET_DRIVER(stm32mp_bsec),
@@ -486,8 +488,8 @@ static void sysconf_init(void)
                if (!ret)
                        otp = otp & BIT(13);
 
-               /* get VDD = pwr-supply */
-               ret = device_get_supply_regulator(pwr_dev, "pwr-supply",
+               /* get VDD = vdd-supply */
+               ret = device_get_supply_regulator(pwr_dev, "vdd-supply",
                                                  &pwr_reg);
 
                /* check if VDD is Low Voltage */