firmware: scmi: fix sandbox and related tests for clock discovery

[u-boot.git] / arch / sandbox / dts / test.dts

diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index e5261bb9fa26923c49c827bc5b8bb501df864b51..3d206fdb3cf8080f15441ef311247020dbe3cf35 100644 (file)
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -499,6 +499,10 @@
                compatible = "sandbox,clk-ccf";
        };
 
+       efi-media {
+               compatible = "sandbox,efi-media";
+       };
+
        eth@10002000 {
                compatible = "sandbox,eth";
                reg = <0x10002000 0x1000>;
@@ -570,17 +574,21 @@
                        compatible = "sandbox,firmware";
                };
 
-               sandbox-scmi-agent@0 {
+               scmi {
                        compatible = "sandbox,scmi-agent";
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       clk_scmi0: protocol@14 {
+                       protocol@10 {
+                               reg = <0x10>;
+                       };
+
+                       clk_scmi: protocol@14 {
                                reg = <0x14>;
                                #clock-cells = <1>;
                        };
 
-                       reset_scmi0: protocol@16 {
+                       reset_scmi: protocol@16 {
                                reg = <0x16>;
                                #reset-cells = <1>;
                        };
@@ -592,13 +600,13 @@
                                        #address-cells = <1>;
                                        #size-cells = <0>;
 
-                                       regul0_scmi0: reg@0 {
+                                       regul0_scmi: reg@0 {
                                                reg = <0>;
                                                regulator-name = "sandbox-voltd0";
                                                regulator-min-microvolt = <1100000>;
                                                regulator-max-microvolt = <3300000>;
                                        };
-                                       regul1_scmi0: reg@1 {
+                                       regul1_scmi: reg@1 {
                                                reg = <0x1>;
                                                regulator-name = "sandbox-voltd1";
                                                regulator-min-microvolt = <1800000>;
@@ -606,21 +614,6 @@
                                };
                        };
                };
-
-               sandbox-scmi-agent@1 {
-                       compatible = "sandbox,scmi-agent";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       clk_scmi1: protocol@14 {
-                               reg = <0x14>;
-                               #clock-cells = <1>;
-                       };
-
-                       protocol@10 {
-                               reg = <0x10>;
-                       };
-               };
        };
 
        pinctrl-gpio {
@@ -1399,10 +1392,10 @@
 
        sandbox_scmi {
                compatible = "sandbox,scmi-devices";
-               clocks = <&clk_scmi0 7>, <&clk_scmi0 3>, <&clk_scmi1 1>;
-               resets = <&reset_scmi0 3>;
-               regul0-supply = <&regul0_scmi0>;
-               regul1-supply = <&regul1_scmi0>;
+               clocks = <&clk_scmi 2>, <&clk_scmi 0>;
+               resets = <&reset_scmi 3>;
+               regul0-supply = <&regul0_scmi>;
+               regul1-supply = <&regul1_scmi>;
        };
 
        pinctrl {