microchipsw: update DTS with the latest pending upstream

Update the DTS to the latest pending upstream version, it looks like this
should get merged soon upstream.

Signed-off-by: Robert Marko <robert.marko@sartura.hr>

diff --git a/target/linux/microchipsw/dts/clk-lan9691.h b/target/linux/microchipsw/dts/clk-lan9691.h
index f0006a6037479be919cc8674a4870829aade3a7c..0f2d7a0f881ef3698b17fa9b2c4c8a41ce5326ae 100644 (file)
--- a/target/linux/microchipsw/dts/clk-lan9691.h
+++ b/target/linux/microchipsw/dts/clk-lan9691.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
+/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */
 
 #ifndef _DTS_CLK_LAN9691_H
 #define _DTS_CLK_LAN9691_H

diff --git a/target/linux/microchipsw/dts/lan9696-ev23x71a.dts b/target/linux/microchipsw/dts/lan9696-ev23x71a.dts
index a469da03852a4e0415e61e4af80d67b4f6b81cf7..4935b6d7b143ee33a437db564ae4e998b8860a08 100644 (file)
--- a/target/linux/microchipsw/dts/lan9696-ev23x71a.dts
+++ b/target/linux/microchipsw/dts/lan9696-ev23x71a.dts
@@ -207,14 +207,24 @@
                function = "fc";
        };
 
+       mdio_irq_pins: mdio-irq-pins {
+               pins = "GPIO_11";
+               function = "miim_irq";
+       };
+
        mdio_pins: mdio-pins {
                pins = "GPIO_9", "GPIO_10";
                function = "miim";
        };
 
-       mdio_irq_pins: mdio-irq-pins {
-               pins = "GPIO_11";
-               function = "miim_irq";
+       ptp_ext_pins: ptp-ext-pins {
+               pins = "GPIO_59";
+               function = "ptpsync_5";
+       };
+
+       ptp_out_pins: ptp-out-pins {
+               pins = "GPIO_58";
+               function = "ptpsync_4";
        };
 
        sgpio_pins: sgpio-pins {
@@ -223,18 +233,6 @@
                function = "sgpio_a";
        };
 
-       usb_ulpi_pins: usb-ulpi-pins {
-               pins = "GPIO_30", "GPIO_31", "GPIO_32", "GPIO_33",
-                      "GPIO_34", "GPIO_35", "GPIO_36", "GPIO_37",
-                      "GPIO_38", "GPIO_39", "GPIO_40", "GPIO_41";
-               function = "usb_ulpi";
-       };
-
-       usb_rst_pins: usb-rst-pins {
-               pins = "GPIO_12";
-               function = "usb2phy_rst";
-       };
-
        usb_over_pins: usb-over-pins {
                pins = "GPIO_13";
                function = "usb_over_detect";
@@ -245,14 +243,16 @@
                function = "usb_power";
        };
 
-       ptp_out_pins: ptp-out-pins {
-               pins = "GPIO_58";
-               function = "ptpsync_4";
+       usb_rst_pins: usb-rst-pins {
+               pins = "GPIO_12";
+               function = "usb2phy_rst";
        };
 
-       ptp_ext_pins: ptp-ext-pins {
-               pins = "GPIO_59";
-               function = "ptpsync_5";
+       usb_ulpi_pins: usb-ulpi-pins {
+               pins = "GPIO_30", "GPIO_31", "GPIO_32", "GPIO_33",
+                      "GPIO_34", "GPIO_35", "GPIO_36", "GPIO_37",
+                      "GPIO_38", "GPIO_39", "GPIO_40", "GPIO_41";
+               function = "usb_ulpi";
        };
 };
 
@@ -770,7 +770,6 @@
 
                port29: port@29 {
                        reg = <29>;
-                       phys = <&serdes 11>;
                        phy-handle = <&phy3>;
                        phy-mode = "rgmii-id";
                        microchip,bandwidth = <1000>;