From: Robert Marko <robert.marko@sartura.hr>
Date: Fri, 23 Jan 2026 09:54:19 +0000 (+0100)
Subject: microchipsw: update DTS with the latest pending upstream
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19e097e18abbb00f76d77a74e92d822da84ad479;p=thirdparty%2Fopenwrt.git

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 f0006a60374..0f2d7a0f881 100644
--- 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 a469da03852..4935b6d7b14 100644
--- 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>;