Merge tag 'soc-dt-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / arch / arm64 / boot / dts / qcom / sa8155p-adp.dts

diff --git a/arch/arm64/boot/dts/qcom/sa8155p-adp.dts b/arch/arm64/boot/dts/qcom/sa8155p-adp.dts
index 15e1ae1c1a9774302bf44490e99cbb515cb61208..5e4287f8c8cd19c84181b9533b9476eb0f7927ca 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 {
@@ -352,19 +329,40 @@
        max-speed = <1000>;
 
        mdio {
-               #address-cells = <0x1>;
-               #size-cells = <0x0>;
-
                compatible = "snps,dwmac-mdio";
+               #address-cells = <1>;
+               #size-cells = <0>;
 
                /* Micrel KSZ9031RNZ PHY */
                rgmii_phy: phy@7 {
+                       compatible = "ethernet-phy-ieee802.3-c22";
                        reg = <0x7>;
 
-                       interrupt-parent = <&tlmm>;
-                       interrupts-extended = <&tlmm 124 IRQ_TYPE_EDGE_FALLING>; /* phy intr */
+                       interrupts-extended = <&tlmm 124 IRQ_TYPE_EDGE_FALLING>;
                        device_type = "ethernet-phy";
-                       compatible = "ethernet-phy-ieee802.3-c22";
+               };
+       };
+
+       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>;
                };
        };
 };