ramips: mt7621-dts: describe switch PHYs and adjust PHY muxing

Currently, the MT7530 DSA subdriver configures the MT7530 switch to provide
direct access to switch PHYs, meaning, the switch PHYs listen on the MDIO
bus the switch listens on. The PHY muxing feature makes use of this.

This is problematic as the PHY may be attached before the switch is
initialised, in which case, the PHY will fail to be attached.

Since commit 91374ba537bd ("net: dsa: mt7530: support OF-based registration
of switch MDIO bus") on mainline Linux, we can describe the switch PHYs on
the MDIO bus of the switch on the device tree.

When the PHY is described this way, the switch will be initialised first,
then the switch MDIO bus will be registered. Only after these steps, the
PHY will be attached.

Describe the switch PHYs on mt7621.dtsi and remove defining the switch PHY
on the SoC's mdio bus node. When the PHY muxing is in use, the interrupts
for the muxed PHY won't work, therefore delete the "interrupts" property on
the devices where the PHY muxing feature is in use.

Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>

target/linux/ramips/dts/mt7621.dtsi

@@ -474,6 +474,36 @@
 				#interrupt-cells = <1>;
 				interrupts = <GIC_SHARED 23 IRQ_TYPE_LEVEL_HIGH>;
 
+				mdio {
+					#address-cells = <1>;
+					#size-cells = <0>;
+
+					ethphy0: ethernet-phy@0 {
+						reg = <0>;
+						interrupts = <0>;
+					};
+
+					ethphy1: ethernet-phy@1 {
+						reg = <1>;
+						interrupts = <1>;
+					};
+
+					ethphy2: ethernet-phy@2 {
+						reg = <2>;
+						interrupts = <2>;
+					};
+
+					ethphy3: ethernet-phy@3 {
+						reg = <3>;
+						interrupts = <3>;
+					};
+
+					ethphy4: ethernet-phy@4 {
+						reg = <4>;
+						interrupts = <4>;
+					};
+				};
+
 				ports {
 					#address-cells = <1>;
 					#size-cells = <0>;
@@ -482,30 +512,35 @@
 						status = "disabled";
 						reg = <0>;
 						label = "lan0";
+						phy-handle = <&ethphy0>;
 					};
 
 					port@1 {
 						status = "disabled";
 						reg = <1>;
 						label = "lan1";
+						phy-handle = <&ethphy1>;
 					};
 
 					port@2 {
 						status = "disabled";
 						reg = <2>;
 						label = "lan2";
+						phy-handle = <&ethphy2>;
 					};
 
 					port@3 {
 						status = "disabled";
 						reg = <3>;
 						label = "lan3";
+						phy-handle = <&ethphy3>;
 					};
 
 					port@4 {
 						status = "disabled";
 						reg = <4>;
 						label = "lan4";
+						phy-handle = <&ethphy4>;
 					};
 
 					port@6 {

target/linux/ramips/dts/mt7621_adslr_g7.dts

@@ -136,10 +136,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_afoundry_ew1200.dts

@@ -155,10 +155,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_alfa-network_ax1800rm.dts

@@ -176,10 +176,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_ampedwireless_ally-r1900k.dts

@@ -13,10 +13,8 @@
 	phy-handle = <&ethphy4>;
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_arcadyan_we420223-99.dts

@@ -203,10 +203,8 @@
 	phy-handle = <&ethphy0>;
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &pcie {

target/linux/ramips/dts/mt7621_arcadyan_wg4xx223.dtsi

@@ -185,10 +185,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_asiarf_ap7621.dtsi

@@ -111,10 +111,8 @@
 	status = "okay";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &gmac0 {

target/linux/ramips/dts/mt7621_asus_rt-ac57u-v1.dts

@@ -170,10 +170,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi

@@ -166,10 +166,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_asus_rt-ax53u.dts

@@ -183,10 +183,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_asus_rt-ax54.dts

@@ -157,10 +157,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_asus_rt-n56u-b1.dts

@@ -182,10 +182,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_beeline_smartbox-giga.dts

@@ -216,10 +216,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_beeline_smartbox-turbo-plus.dts

@@ -209,10 +209,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_belkin_rt1800.dts

@@ -162,10 +162,8 @@
 	phy-handle = <&ethphy0>;
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts

@@ -174,10 +174,8 @@
 	phy-handle = <&ethphy4>;
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_buffalo_wsr-2533dhpl.dts

@@ -199,10 +199,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts

@@ -208,10 +208,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_cudy_m1800.dts

@@ -66,10 +66,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &pcie {

target/linux/ramips/dts/mt7621_cudy_wr1300-v1.dts

@@ -193,10 +193,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_cudy_wr1300-v2v3.dtsi

@@ -153,10 +153,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_cudy_wr2100.dts

@@ -208,10 +208,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_cudy_x6.dtsi

@@ -116,10 +116,8 @@
 	phy-handle = <&ethphy4>;
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_dlink_covr-x1860-a1.dts

@@ -184,10 +184,8 @@
 	phy-handle = <&ethphy4>;
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_dlink_dir-853-a1.dts

@@ -187,10 +187,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_dlink_dir-853-a3.dts

@@ -203,10 +203,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_dlink_dir-853-r1.dts

@@ -120,10 +120,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts

@@ -144,10 +144,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_dlink_dir-8xx.dtsi

@@ -110,10 +110,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_dlink_dir-xx60-a1.dtsi

@@ -188,10 +188,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_edimax_rx21s.dtsi

@@ -151,10 +151,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts

@@ -85,10 +85,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_elecom_wrc-2533ghbk.dtsi

@@ -124,10 +124,8 @@
 	phy-handle = <&ethphy0>;
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_elecom_wrc-gs.dtsi

@@ -94,10 +94,8 @@
 	phy-handle = <&ethphy0>;
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_etisalat_s3.dts

@@ -209,10 +209,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts

@@ -144,10 +144,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts

@@ -145,10 +145,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts

@@ -116,10 +116,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_h3c_tx180x.dtsi

@@ -58,10 +58,8 @@
 	phy-handle = <&ethphy4>;
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &nand {

target/linux/ramips/dts/mt7621_haier-sim_wr1800k.dtsi

@@ -73,10 +73,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &nand {

target/linux/ramips/dts/mt7621_hilink_hlk-7621a-evb.dts

@@ -77,10 +77,8 @@
 	phy-handle = <&ethphy4>;
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts

@@ -153,10 +153,8 @@
 	phy-handle = <&ethphy4>;
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_huasifei_ws1208v2.dts

@@ -169,10 +169,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_humax_e10.dts

@@ -169,10 +169,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts

@@ -174,10 +174,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_iodata_wn-deax1800gr.dts

@@ -186,10 +186,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_iodata_wn-dx1200gr.dts

@@ -170,10 +170,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts

@@ -160,10 +160,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_iodata_wn-xx-xr.dtsi

@@ -161,10 +161,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts

@@ -153,10 +153,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_iptime_a3002mesh.dts

@@ -130,10 +130,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_iptime_a3004ns-dual.dts

@@ -134,10 +134,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_iptime_a3004t.dts

@@ -135,10 +135,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_iptime_a6004ns-m.dtsi

@@ -152,10 +152,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_iptime_a8004t.dts

@@ -138,10 +138,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_iptime_ax2004m.dts

@@ -148,10 +148,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_iptime_t5004.dts

@@ -91,10 +91,8 @@
 	phy-handle = <&ethphy0>;
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_jcg_jhr-ac876m.dts

@@ -168,10 +168,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_jcg_q20.dts

@@ -180,10 +180,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_jcg_y2.dts

@@ -121,10 +121,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_keenetic_kn-3010.dts

@@ -201,10 +201,8 @@
 	};
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &gmac0 {

target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts

@@ -179,10 +179,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_linksys_e5600.dts

@@ -175,10 +175,8 @@
 	phy-handle = <&ethphy4>;
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_linksys_e7350.dts

@@ -156,10 +156,8 @@
 	phy-handle = <&ethphy0>;
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_linksys_ea6350-v4.dts

@@ -16,14 +16,12 @@
 	phy-handle = <&ethphy4>;
 };
 
-&mdio {
+&ethphy0 {
-	ethernet-phy@0 {
+	interrupts = <0>;
-		status = "disabled";
+};
-	};
 
-	ethphy4: ethernet-phy@4 {
+&ethphy4 {
-		reg = <4>;
+	/delete-property/ interrupts;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_linksys_ea7xxx.dtsi

@@ -203,10 +203,8 @@
 	phy-handle = <&ethphy0>;
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_linksys_re6500.dts

@@ -148,10 +148,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts

@@ -138,10 +138,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_mediatek_mt7621-eval-board.dts

@@ -45,10 +45,8 @@
 	phy-handle = <&ethphy4>;
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_meig_slt866.dts

@@ -199,10 +199,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_mercusys_mr70x-v1.dts

@@ -145,10 +145,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts

@@ -42,10 +42,8 @@
 	phy-handle = <&ethphy0>;
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_mikrotik_routerboard-m33g.dts

@@ -96,10 +96,8 @@
 	phy-handle = <&ethphy0>;
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi

@@ -118,10 +118,8 @@
 	phy-handle = <&ethphy4>;
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_netgear_sercomm_bzv.dtsi

@@ -184,10 +184,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi

@@ -115,10 +115,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_netgear_wac104.dts

@@ -170,10 +170,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_netgear_wax202.dts

@@ -244,10 +244,8 @@
 	phy-handle = <&ethphy0>;
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_netis_wf2881.dts

@@ -162,10 +162,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_oraybox_x3a.dts

@@ -156,10 +156,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_phicomm_k2p.dts

@@ -146,10 +146,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_planex_vr500.dts

@@ -104,10 +104,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_raisecom_msg1500-x-00.dts

@@ -163,10 +163,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_renkforce_ws-wn530hp3-a.dts

@@ -140,10 +140,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_rostelecom_rt-fe-1a.dts

@@ -228,10 +228,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_samknows_whitebox-v8.dts

@@ -146,10 +146,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_sercomm_dxx_nand_256m.dtsi

@@ -208,10 +208,8 @@
 	phy-handle = <&ethphy0>;
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_snr_snr-cpe-me1.dts

@@ -90,10 +90,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &pcie {

target/linux/ramips/dts/mt7621_snr_snr-cpe-me2-lite.dts

@@ -112,10 +112,8 @@
 	status = "okay";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &gmac0 {

target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts

@@ -154,10 +154,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_tenbay_t-mb5eu-v01.dts

@@ -125,10 +125,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_totolink_a7000r.dts

@@ -135,10 +135,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_totolink_x5000r.dts

@@ -130,10 +130,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_tplink_archer-ax23-v1.dts

@@ -181,10 +181,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy4 {
-	ethphy4: ethernet-phy@4 {
+	/delete-property/ interrupts;
-		reg = <4>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_tplink_archer-c6u-v1.dts

@@ -206,10 +206,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_tplink_eap235-wall-v1.dts

@@ -189,10 +189,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_tplink_eap615-wall-v1.dts

@@ -182,10 +182,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_tplink_ec330-g5u-v1.dts

@@ -283,10 +283,8 @@
 	nvmem-cell-names = "mac-address";
 };
 
-&mdio {
+&ethphy0 {
-	ethphy0: ethernet-phy@0 {
+	/delete-property/ interrupts;
-		reg = <0>;
-	};
 };
 
 &switch0 {

target/linux/ramips/dts/mt7621_tplink_er605-v2.dts

@@ -155,11 +155,8 @@
 	};
 };
 
-
+&ethphy0 {
-&mdio {
+	/delete-property/ interrupts;
-	ethphy0: ethernet-phy@0 {
-		reg = <0>;
-	};
 };
 
 &state_default {