arm64: dts: qcom: sa8155p-adp: Move mtl nodes into ethernet node

The mtl nodes aren't evaluated unless they're under the node with the
compatible. Move them so they're now evaluated in case future patchsets
modify them incorrectly.

An example of this can be seen in the link.

Link: https://lore.kernel.org/linux-arm-msm/20230414145844.wyg6pt623pzqwh5l@halaney-x13s/
Signed-off-by: Andrew Halaney <ahalaney@redhat.com>
Reviewed-by: Brian Masney <bmasney@redhat.com>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230501212446.2570364-5-ahalaney@redhat.com

diff --git a/arch/arm64/boot/dts/qcom/sa8155p-adp.dts b/arch/arm64/boot/dts/qcom/sa8155p-adp.dts
index b65e0203d7838f64991b7359620cad39b5406e0a..02d04ce877c9c89f85555d7e23a5cea8dc1124ff 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sa8155p-adp.dts
+++ b/arch/arm64/boot/dts/qcom/sa8155p-adp.dts
@@ -47,29 +47,6 @@
 
                vin-supply = <&vreg_3p3>;
        };
-
-       mtl_rx_setup: rx-queues-config {
-               snps,rx-queues-to-use = <1>;
-               snps,rx-sched-sp;
-
-               queue0 {
-                       snps,dcb-algorithm;
-                       snps,map-to-dma-channel = <0x0>;
-                       snps,route-up;
-                       snps,priority = <0x1>;
-               };
-       };
-
-       mtl_tx_setup: tx-queues-config {
-               snps,tx-queues-to-use = <1>;
-               snps,tx-sched-wrr;
-
-               queue0 {
-                       snps,weight = <0x10>;
-                       snps,dcb-algorithm;
-                       snps,priority = <0x0>;
-               };
-       };
 };
 
 &apps_rsc {
@@ -365,6 +342,29 @@
                        device_type = "ethernet-phy";
                };
        };
+
+       mtl_rx_setup: rx-queues-config {
+               snps,rx-queues-to-use = <1>;
+               snps,rx-sched-sp;
+
+               queue0 {
+                       snps,dcb-algorithm;
+                       snps,map-to-dma-channel = <0x0>;
+                       snps,route-up;
+                       snps,priority = <0x1>;
+               };
+       };
+
+       mtl_tx_setup: tx-queues-config {
+               snps,tx-queues-to-use = <1>;
+               snps,tx-sched-wrr;
+
+               queue0 {
+                       snps,weight = <0x10>;
+                       snps,dcb-algorithm;
+                       snps,priority = <0x0>;
+               };
+       };
 };
 
 &qupv3_id_1 {