ARM: dts: stm32: STM32MP13x SoC exposes SCMI regulators

Updates STM32MP13x SoC DTSI file to define the SoC voltage regulators
exposed by OP-TEE SCMI service and remove the fixed regulator
abstraction previously used until OP-TEE OS firmware embeds the
service which it does since its release tag 3.22.0.

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
Signed-off-by: Pascal Paillet <p.paillet@foss.st.com>
Signed-off-by: Alexandre Torgue <alexandre.torgue@foss.st.com>

diff --git a/arch/arm/boot/dts/st/stm32mp131.dtsi b/arch/arm/boot/dts/st/stm32mp131.dtsi
index 672f3b7..ac90fcb 100644 (file)
--- a/arch/arm/boot/dts/st/stm32mp131.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp131.dtsi
@@ -52,6 +52,28 @@
                                reg = <0x16>;
                                #reset-cells = <1>;
                        };
+
+                       scmi_voltd: protocol@17 {
+                               reg = <0x17>;
+
+                               scmi_regu: regulators {
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+
+                                       scmi_reg11: regulator@0 {
+                                               reg = <VOLTD_SCMI_REG11>;
+                                               regulator-name = "reg11";
+                                       };
+                                       scmi_reg18: regulator@1 {
+                                               reg = <VOLTD_SCMI_REG18>;
+                                               regulator-name = "reg18";
+                                       };
+                                       scmi_usb33: regulator@2 {
+                                               reg = <VOLTD_SCMI_USB33>;
+                                               regulator-name = "usb33";
+                                       };
+                               };
+                       };
                };
        };
 
@@ -78,28 +100,6 @@
                always-on;
        };
 
-       /* PWR 1v1, 1v8 and 3v3 regulators defined as fixed, waiting for SCMI */
-       reg11: reg11 {
-               compatible = "regulator-fixed";
-               regulator-name = "reg11";
-               regulator-min-microvolt = <1100000>;
-               regulator-max-microvolt = <1100000>;
-       };
-
-       reg18: reg18 {
-               compatible = "regulator-fixed";
-               regulator-name = "reg18";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <1800000>;
-       };
-
-       usb33: usb33 {
-               compatible = "regulator-fixed";
-               regulator-name = "usb33";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-       };
-
        soc {
                compatible = "simple-bus";
                #address-cells = <1>;
@@ -801,7 +801,7 @@
                        g-tx-fifo-size = <256 16 16 16 16 16 16 16>;
                        dr_mode = "otg";
                        otg-rev = <0x200>;
-                       usb33d-supply = <&usb33>;
+                       usb33d-supply = <&scmi_usb33>;
                        status = "disabled";
                };
 
@@ -1331,8 +1331,8 @@
                        reg = <0x5a006000 0x1000>;
                        clocks = <&rcc USBPHY_K>;
                        resets = <&rcc USBPHY_R>;
-                       vdda1v1-supply = <&reg11>;
-                       vdda1v8-supply = <&reg18>;
+                       vdda1v1-supply = <&scmi_reg11>;
+                       vdda1v8-supply = <&scmi_reg18>;
                        status = "disabled";
 
                        usbphyc_port0: usb-phy@0 {