[openwrt/openwrt] ipq40xx: drop ESSEDMA + AR40xx DTS nodes

LEDE Commits lede-commits at lists.infradead.org
Sun Oct 2 14:05:38 PDT 2022


blocktrron pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/27b441cbaf426edffa6b90b06bb356528203b33a

commit 27b441cbaf426edffa6b90b06bb356528203b33a
Author: Robert Marko <robert.marko at sartura.hr>
AuthorDate: Sat Feb 19 13:48:36 2022 +0100

    ipq40xx: drop ESSEDMA + AR40xx DTS nodes
    
    In order to start working on IPQESS + DSA drop
    the old ESSEDMA + AR40xx DTS nodes.
    
    Signed-off-by: Robert Marko <robert.marko at sartura.hr>
---
 .../files/arch/arm/boot/dts/qcom-ipq4018-a42.dts   | 28 ---------------
 .../arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dts   | 31 -----------------
 .../arch/arm/boot/dts/qcom-ipq4018-cap-ac.dts      | 14 --------
 .../boot/dts/qcom-ipq4018-cs-w3-wd1200g-eup.dts    | 22 ------------
 .../arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts    | 23 -------------
 .../arch/arm/boot/dts/qcom-ipq4018-ea6350v3.dts    | 12 -------
 .../arch/arm/boot/dts/qcom-ipq4018-eap1300.dts     | 20 -----------
 .../arch/arm/boot/dts/qcom-ipq4018-ecw5211.dts     | 28 ---------------
 .../files/arch/arm/boot/dts/qcom-ipq4018-emd1.dts  | 23 -------------
 .../arch/arm/boot/dts/qcom-ipq4018-emr3500.dts     | 20 -----------
 .../arch/arm/boot/dts/qcom-ipq4018-ens620ext.dts   | 16 ---------
 .../arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi   | 14 --------
 .../arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts    | 13 -------
 .../arch/arm/boot/dts/qcom-ipq4018-gl-ap1300.dts   | 14 --------
 .../arch/arm/boot/dts/qcom-ipq4018-hap-ac2.dts     |  8 -----
 .../arch/arm/boot/dts/qcom-ipq4018-jalapeno.dtsi   | 28 ---------------
 .../boot/dts/qcom-ipq4018-magic-2-wifi-next.dts    | 40 ----------------------
 .../arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts     | 12 -------
 .../arch/arm/boot/dts/qcom-ipq4018-pa1200.dts      | 28 ---------------
 .../arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts    | 12 -------
 .../files/arch/arm/boot/dts/qcom-ipq4018-rutx.dtsi |  4 ---
 .../arch/arm/boot/dts/qcom-ipq4018-sxtsq-5-ac.dts  | 19 ----------
 .../arch/arm/boot/dts/qcom-ipq4018-wac510.dts      | 21 ------------
 .../arch/arm/boot/dts/qcom-ipq4018-wap-ac.dts      | 21 ------------
 .../files/arch/arm/boot/dts/qcom-ipq4018-wr-1.dts  | 13 -------
 .../arch/arm/boot/dts/qcom-ipq4018-wre6606.dts     | 13 -------
 .../arch/arm/boot/dts/qcom-ipq4018-wrtq-329acn.dts | 29 ----------------
 .../files/arch/arm/boot/dts/qcom-ipq4019-a62.dts   | 23 -------------
 .../arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts   | 22 ------------
 .../arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi    | 12 -------
 .../arch/arm/boot/dts/qcom-ipq4019-eap2200.dts     | 17 ---------
 .../arm/boot/dts/qcom-ipq4019-fritzbox-7530.dts    | 13 -------
 .../boot/dts/qcom-ipq4019-fritzrepeater-1200.dts   | 19 ----------
 .../boot/dts/qcom-ipq4019-fritzrepeater-3000.dts   | 20 -----------
 .../arch/arm/boot/dts/qcom-ipq4019-gl-b2200.dts    | 26 --------------
 .../arm/boot/dts/qcom-ipq4019-habanero-dvk.dts     | 12 -------
 .../arch/arm/boot/dts/qcom-ipq4019-hap-ac3.dts     |  8 -----
 .../arch/arm/boot/dts/qcom-ipq4019-lhgg-60ad.dts   | 19 ----------
 .../arch/arm/boot/dts/qcom-ipq4019-map-ac2200.dts  | 12 -------
 .../arch/arm/boot/dts/qcom-ipq4019-mf286d.dts      | 19 ----------
 .../arch/arm/boot/dts/qcom-ipq4019-oap100.dts      | 15 --------
 .../files/arch/arm/boot/dts/qcom-ipq4019-orbi.dtsi | 24 -------------
 .../arch/arm/boot/dts/qcom-ipq4019-pa2200.dts      | 23 -------------
 .../arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi     | 13 -------
 .../arch/arm/boot/dts/qcom-ipq4019-rtl30vw.dts     | 12 -------
 .../arch/arm/boot/dts/qcom-ipq4019-u4019.dtsi      | 12 -------
 .../files/arch/arm/boot/dts/qcom-ipq4019-wifi.dts  | 28 ---------------
 .../arch/arm/boot/dts/qcom-ipq4019-wpj419.dts      | 30 ----------------
 .../arch/arm/boot/dts/qcom-ipq4019-wtr-m2133hp.dts | 24 -------------
 .../files/arch/arm/boot/dts/qcom-ipq4019-x1pro.dts | 14 --------
 .../arch/arm/boot/dts/qcom-ipq4019-x1pro.dtsi      | 12 -------
 .../arch/arm/boot/dts/qcom-ipq4019-xx8300.dtsi     | 12 -------
 .../arch/arm/boot/dts/qcom-ipq4028-wpj428.dts      | 31 -----------------
 .../arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts     |  8 -----
 .../boot/dts/qcom-ipq4029-aruba-glenmorangie.dtsi  | 19 ----------
 .../arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts    | 14 --------
 .../arch/arm/boot/dts/qcom-ipq4029-gl-s1300.dts    | 14 --------
 .../arm/boot/dts/qcom-ipq4029-insect-common.dtsi   | 19 ----------
 .../arch/arm/boot/dts/qcom-ipq4029-ws-ap3915i.dts  | 24 -------------
 59 files changed, 1096 deletions(-)

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-a42.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-a42.dts
index f571da510e..2236edf80b 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-a42.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-a42.dts
@@ -21,10 +21,6 @@
 			status = "okay";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 194b000 {
 			/* select hostmode */
 			compatible = "qcom,tcsr";
@@ -62,14 +58,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 
 	keys {
@@ -174,22 +162,6 @@
 	status = "okay";
 };
 
-&gmac0 {
-	qcom,phy_mdio_addr = <4>;
-	qcom,poll_required = <1>;
-	qcom,forced_speed = <1000>;
-	qcom,forced_duplex = <1>;
-	vlan_tag = <2 0x20>;
-};
-
-&gmac1 {
-	qcom,phy_mdio_addr = <3>;
-	qcom,poll_required = <1>;
-	qcom,forced_speed = <1000>;
-	qcom,forced_duplex = <1>;
-	vlan_tag = <1 0x10>;
-};
-
 &usb2_hs_phy {
 	status = "okay";
 };
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dts
index b2d8aa4999..def355b465 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dts
@@ -65,10 +65,6 @@
 			pinctrl-names = "default";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		counter at 4a1000 {
 			compatible = "qcom,qca-gcnt";
 			reg = <0x4a1000 0x4>;
@@ -118,17 +114,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-
-			switch_lan_bmp = <0x10>;
-			switch_wan_bmp = <0x20>;
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 };
 
@@ -277,22 +262,6 @@
 	#gpio-cells = <2>;
 };
 
-&gmac0 {
-	qcom,forced_duplex = <1>;
-	qcom,forced_speed = <1000>;
-	qcom,phy_mdio_addr = <3>;
-	qcom,poll_required = <1>;
-	vlan_tag = <1 0x10>;
-};
-
-&gmac1 {
-	qcom,forced_duplex = <1>;
-	qcom,forced_speed = <1000>;
-	qcom,phy_mdio_addr = <4>;
-	qcom,poll_required = <1>;
-	vlan_tag = <2 0x20>;
-};
-
 &tlmm {
 	i2c0_pins: i2c0_pinmux {
 		mux_i2c {
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-cap-ac.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-cap-ac.dts
index b18ba4d46a..515d71b456 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-cap-ac.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-cap-ac.dts
@@ -61,16 +61,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-			qcom,poll_required = <0>;
-			qcom,num_gmac = <1>;
-		};
 	};
 
 	keys {
@@ -222,10 +212,6 @@
 	status = "okay";
 };
 
-&gmac0 {
-	vlan_tag = <0 0x3f>;
-};
-
 &ethphy3 {
 	gpio-controller;
 	#gpio-cells = <2>;
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-cs-w3-wd1200g-eup.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-cs-w3-wd1200g-eup.dts
index 52311755b7..dea5c2dc36 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-cs-w3-wd1200g-eup.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-cs-w3-wd1200g-eup.dts
@@ -29,10 +29,6 @@
 			reset-delay-us = <5000>;
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -64,14 +60,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 
 	leds {
@@ -264,13 +252,3 @@
 	nvmem-cell-names = "pre-calibration";
 	nvmem-cells = <&precal_art_5000>;
 };
-
-&gmac0 {
-	nvmem-cell-names = "mac-address";
-	nvmem-cells = <&macaddr_art_6>;
-};
-
-&gmac1 {
-	nvmem-cell-names = "mac-address";
-	nvmem-cells = <&macaddr_art_0>;
-};
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts
index e3afddb376..ff8053c42b 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts
@@ -17,11 +17,6 @@
 	};
 
 	soc {
-		edma at c080000 {
-			qcom,num_gmac = <1>;
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -51,16 +46,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-			switch_lan_bmp = <0x20>;
-			switch_wan_bmp = <0x00>;
-		};
-
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
 	};
 
 	leds {
@@ -192,14 +177,6 @@
 	status = "okay";
 };
 
-&gmac0 {
-	qcom,phy_mdio_addr = <4>;
-	qcom,poll_required = <1>;
-	qcom,forced_speed = <1000>;
-	qcom,forced_duplex = <1>;
-	vlan_tag = <1 0x20>;
-};
-
 &mdio {
 	status = "okay";
 };
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ea6350v3.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ea6350v3.dts
index a99aa90b61..0fd9654111 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ea6350v3.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ea6350v3.dts
@@ -25,10 +25,6 @@
 			status = "okay";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -68,14 +64,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 
 	keys {
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts
index 6a7f4e5b0f..a8f24aa00e 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts
@@ -18,10 +18,6 @@
 			status = "okay";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -47,14 +43,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 
 	keys {
@@ -227,14 +215,6 @@
 	status = "okay";
 };
 
-&gmac0 {
-	vlan_tag = <2 0x20>;
-};
-
-&gmac1 {
-	vlan_tag = <1 0x10>;
-};
-
 &wifi0 {
 	status = "okay";
 	nvmem-cell-names = "pre-calibration";
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ecw5211.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ecw5211.dts
index 6f4d7b5f32..df2ef37f17 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ecw5211.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ecw5211.dts
@@ -14,7 +14,6 @@
 		led-failsafe = &led_power;
 		led-running = &led_power;
 		led-upgrade = &led_power;
-		label-mac-device = &gmac0;
 	};
 
 	chosen {
@@ -57,10 +56,6 @@
 			status = "okay";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		counter at 4a1000 {
 			compatible = "qcom,qca-gcnt";
 			reg = <0x4a1000 0x4>;
@@ -110,17 +105,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-
-			switch_lan_bmp = <0x10>;
-			switch_wan_bmp = <0x20>;
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 };
 
@@ -303,18 +287,6 @@
 	pinctrl-names = "default";
 };
 
-&gmac0 {
-	qcom,poll_required = <1>;
-	qcom,phy_mdio_addr = <4>;
-	vlan_tag = <2 0x20>;
-};
-
-&gmac1 {
-	qcom,poll_required = <1>;
-	qcom,phy_mdio_addr = <3>;
-	vlan_tag = <1 0x10>;
-};
-
 &wifi0 {
 	status = "okay";
 	nvmem-cell-names = "pre-calibration";
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emd1.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emd1.dts
index b405867134..396595ba51 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emd1.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emd1.dts
@@ -25,10 +25,6 @@
 			status = "okay";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -54,17 +50,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-			switch_lan_bmp = <0x20>;
-			switch_wan_bmp = <0x00>;
-		};
-
-		edma at c080000 {
-			status = "okay";
-			qcom,num_gmac = <1>;
-		};
 	};
 
 	keys {
@@ -210,14 +195,6 @@
 	status = "okay";
 };
 
-&gmac0 {
-	qcom,phy_mdio_addr = <4>;
-	qcom,poll_required = <1>;
-	qcom,forced_speed = <1000>;
-	qcom,forced_duplex = <1>;
-	vlan_tag = <1 0x20>;
-};
-
 &cryptobam {
 	status = "okay";
 };
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emr3500.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emr3500.dts
index 848e5c2363..3616149451 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emr3500.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emr3500.dts
@@ -18,10 +18,6 @@
 			status = "okay";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -51,14 +47,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 
 	keys {
@@ -212,14 +200,6 @@
 	status = "okay";
 };
 
-&gmac0 {
-	vlan_tag = <1 0x10>;
-};
-
-&gmac1 {
-	vlan_tag = <2 0x20>;
-};
-
 &usb2_hs_phy {
 	status = "okay";
 };
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ens620ext.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ens620ext.dts
index b765d68b51..69275e24b8 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ens620ext.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ens620ext.dts
@@ -26,14 +26,6 @@
 			status = "okay";
 		};
 
-		mdio at 90000 {
-			status = "okay";
-		};
-
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -60,14 +52,6 @@
 			status = "okay";
 		};
 
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
-
 		/*
 		 * Disable the broken restart as a workaround for the buggy
 		 * 3.0.0/3.0.1 U-boots that ship with the device.
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi
index eb97130c27..ddb2c9bd03 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi
@@ -33,10 +33,6 @@
 			status = "okay";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -62,15 +58,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-			qcom,num_gmac = <1>;
-		};
 	};
 
 	aliases {
@@ -78,7 +65,6 @@
 		led-failsafe = &power_amber;
 		led-running = &power_green;
 		led-upgrade = &power_amber;
-		label-mac-device = &gmac0;
 	};
 
 	keys {
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts
index 77b1810f09..d962ca58fa 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts
@@ -14,7 +14,6 @@
 		led-failsafe = &flash;
 		led-running = &power;
 		led-upgrade = &flash;
-		label-mac-device = &gmac0;
 	};
 
 	soc {
@@ -26,10 +25,6 @@
 			status = "okay";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -69,14 +64,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 
 	keys {
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-ap1300.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-ap1300.dts
index b96f014dd2..41ed66e595 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-ap1300.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-ap1300.dts
@@ -35,10 +35,6 @@
 			status = "okay";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -80,16 +76,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-			switch_lan_bmp = <0x18>;
-			switch_wan_bmp = <0x20>;
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 
 	keys {
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-hap-ac2.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-hap-ac2.dts
index b5818cef39..ee174a29d1 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-hap-ac2.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-hap-ac2.dts
@@ -78,14 +78,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 
 	keys {
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-jalapeno.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-jalapeno.dtsi
index da09e53cc3..ee94a15c00 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-jalapeno.dtsi
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-jalapeno.dtsi
@@ -19,10 +19,6 @@
 			pinctrl-names = "default";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		counter at 4a1000 {
 			compatible = "qcom,qca-gcnt";
 			reg = <0x4a1000 0x4>;
@@ -69,16 +65,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-
-			switch_lan_bmp = <0x10>; /* lan port bitmap */
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 };
 
@@ -241,20 +227,6 @@
 	status = "okay";
 };
 
-&gmac0 {
-	qcom,poll_required = <1>;
-	qcom,poll_required_dynamic = <1>;
-	qcom,phy_mdio_addr = <3>;
-	vlan_tag = <1 0x10>;
-};
-
-&gmac1 {
-	qcom,poll_required = <1>;
-	qcom,poll_required_dynamic = <1>;
-	qcom,phy_mdio_addr = <4>;
-	vlan_tag = <2 0x20>;
-};
-
 &wifi0 {
 	status = "okay";
 	nvmem-cell-names = "pre-calibration";
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-magic-2-wifi-next.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-magic-2-wifi-next.dts
index 2709aef502..f1bd88f942 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-magic-2-wifi-next.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-magic-2-wifi-next.dts
@@ -29,10 +29,6 @@
 			/delete-node/ ethernet-phy at 1;
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		crypto at 8e3a000 {
 			status = "okay";
 		};
@@ -41,42 +37,6 @@
 			status = "okay";
 		};
 
-		ess-switch at c000000 {
-			status = "okay";
-			switch_lan_bmp = <0x3e>;
-			switch_wan_bmp = <0x0>;
-		};
-
-		edma at c080000 {
-			status = "okay";
-			qcom,num_gmac = <3>;
-
-			gmac0 {
-				qcom,phy_mdio_addr = <3>;
-				qcom,poll_required = <1>;
-				/delete-property/ qcom,forced_speed;
-				/delete-property/ qcom,forced_duplex;
-				vlan_tag = <1 0x10>;
-			};
-
-			gmac1 {
-				qcom,phy_mdio_addr = <2>;
-				qcom,poll_required = <1>;
-				/delete-property/ qcom,forced_speed;
-				/delete-property/ qcom,forced_duplex;
-				vlan_tag = <1 0x08>;
-			};
-
-			gmac2 {
-				local-mac-address = [00 00 00 00 00 00];
-				qcom,phy_mdio_addr = <4>;
-				qcom,poll_required = <1>;
-				/delete-property/ qcom,forced_speed;
-				/delete-property/ qcom,forced_duplex;
-				vlan_tag = <1 0x20>;
-			};
-		};
-
 		gpio_export {
 			compatible = "gpio-export";
 			#size-cells = <0>;
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts
index caafc1beb4..4922938692 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts
@@ -35,10 +35,6 @@
 			status = "okay";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -103,14 +99,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 
 	keys {
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-pa1200.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-pa1200.dts
index bcb9552ce7..4e08dd39d0 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-pa1200.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-pa1200.dts
@@ -21,10 +21,6 @@
 			status = "okay";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 194b000 {
 			/* select hostmode */
 			compatible = "qcom,tcsr";
@@ -62,14 +58,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 
 	keys {
@@ -166,22 +154,6 @@
 	status = "okay";
 };
 
-&gmac0 {
-	qcom,phy_mdio_addr = <4>;
-	qcom,poll_required = <1>;
-	qcom,forced_speed = <1000>;
-	qcom,forced_duplex = <1>;
-	vlan_tag = <2 0x20>;
-};
-
-&gmac1 {
-	qcom,phy_mdio_addr = <3>;
-	qcom,poll_required = <1>;
-	qcom,forced_speed = <1000>;
-	qcom,forced_duplex = <1>;
-	vlan_tag = <1 0x10>;
-};
-
 &usb2_hs_phy {
 	status = "okay";
 };
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts
index ac4d4a139c..1d860627b5 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts
@@ -30,10 +30,6 @@
 			status = "okay";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -84,14 +80,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 
 	keys {
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-rutx.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-rutx.dtsi
index 3673a13430..230b62a94e 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-rutx.dtsi
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-rutx.dtsi
@@ -6,10 +6,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	aliases {
-		label-mac-device = &gmac0;
-	};
-
 	memory {
 		device_type = "memory";
 		reg = <0x80000000 0x10000000>;
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-sxtsq-5-ac.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-sxtsq-5-ac.dts
index 87bceecbba..9c95ccc141 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-sxtsq-5-ac.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-sxtsq-5-ac.dts
@@ -65,17 +65,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-			phy-mode = "rgmii";
-			qcom,num_gmac = <1>;
-			qcom,single-phy;
-		};
 	};
 
 	keys {
@@ -228,14 +217,6 @@
 	qcom,ath10k-calibration-variant = "MikroTik-SXTsq-5-ac";
 };
 
-&gmac0 {
-	qcom,phy_mdio_addr = <4>;
-	qcom,poll_required = <1>;
-	qcom,forced_speed = <1000>;
-	qcom,forced_duplex = <1>;
-	vlan_tag = <1 0x20>;
-};
-
 &mdio {
 	status = "okay";
 };
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wac510.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wac510.dts
index d6c0ff0938..aa54f43e85 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wac510.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wac510.dts
@@ -16,7 +16,6 @@
 		led-failsafe = &led_power_amber;
 		led-running = &led_power_green;
 		led-upgrade = &led_power_amber;
-		label-mac-device = &gmac0;
 	};
 
 	chosen {
@@ -28,10 +27,6 @@
 			status = "okay";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		counter at 4a1000 {
 			compatible = "qcom,qca-gcnt";
 			reg = <0x4a1000 0x4>;
@@ -62,14 +57,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 
 	keys {
@@ -358,14 +345,6 @@
 	reset-delay-us = <2000>;
 };
 
-&gmac0 {
-	qcom,forced_duplex = <1>;
-	qcom,forced_speed = <1000>;
-	qcom,phy_mdio_addr = <3>;
-	qcom,poll_required = <1>;
-	vlan_tag = <1 0x10>;
-};
-
 &wifi0 {
 	status = "okay";
 	nvmem-cell-names = "pre-calibration", "mac-address";
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wap-ac.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wap-ac.dts
index a77b85aa54..e6a6202216 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wap-ac.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wap-ac.dts
@@ -49,14 +49,6 @@
 			reg = <0x1957000 0x100>;
 			qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 
 	keys {
@@ -195,19 +187,6 @@
 	status = "okay";
 };
 
-&gmac0 {
-	qcom,phy_mdio_addr = <4>;
-	qcom,poll_required = <1>;
-	qcom,forced_speed = <1000>;
-	qcom,forced_duplex = <1>;
-	vlan_tag = <2 0x20>;
-};
-
-&gmac1 {
-	qcom,phy_mdio_addr = <3>;
-	vlan_tag = <1 0x10>;
-};
-
 &wifi0 {
 	status = "okay";
 
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wr-1.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wr-1.dts
index be2f619b39..317fe26e2e 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wr-1.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wr-1.dts
@@ -11,7 +11,6 @@
 	compatible = "pakedge,wr-1";
 
 	aliases {
-		label-mac-device = &gmac0;
 		led-boot = &led_power;
 		led-failsafe = &led_power;
 		led-running = &led_power;
@@ -60,10 +59,6 @@
 	};
 
 	soc {
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -87,14 +82,6 @@
 			reg = <0x1957000 0x100>;
 			qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 };
 
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts
index 8fa5a31908..efb267ae36 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts
@@ -44,10 +44,6 @@
 			status = "okay";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -73,15 +69,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-			qcom,num_gmac = <1>;
-		};
 	};
 
 	leds {
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wrtq-329acn.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wrtq-329acn.dts
index 2af4296342..ed9996f097 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wrtq-329acn.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wrtq-329acn.dts
@@ -53,10 +53,6 @@
 			/delete-node/ ethernet-phy at 3;
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -96,17 +92,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-
-			switch_lan_bmp = <0x1e>;
-			switch_wan_bmp = <0x20>;
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 };
 
@@ -232,20 +217,6 @@
 	status = "okay";
 };
 
-&gmac0 {
-	qcom,phy_mdio_addr = <2>;
-	qcom,poll_required = <1>;
-	nvmem-cell-names = "mac-address";
-	nvmem-cells = <&macaddr_art_6>;
-};
-
-&gmac1 {
-	qcom,phy_mdio_addr = <4>;
-	qcom,poll_required = <1>;
-	nvmem-cell-names = "mac-address";
-	nvmem-cells = <&macaddr_art_0>;
-};
-
 &tlmm {
 	serial0_pins: serial0_pinmux {
 		mux {
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-a62.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-a62.dts
index 279050fa15..799e3cb415 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-a62.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-a62.dts
@@ -21,10 +21,6 @@
 			status = "okay";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 194b000 {
 			/* select hostmode */
 			compatible = "qcom,tcsr";
@@ -62,17 +58,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			switch_lan_bmp = <0x10>;
-			switch_wan_bmp = <0x20>;
-
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 
 	keys {
@@ -184,14 +169,6 @@
 	status = "okay";
 };
 
-&gmac0 {
-	qcom,phy_mdio_addr = <3>;
-	qcom,poll_required = <1>;
-	qcom,forced_speed = <1000>;
-	qcom,forced_duplex = <1>;
-	vlan_tag = <1 0x10>;
-};
-
 &usb2_hs_phy {
 	status = "okay";
 };
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts
index ba6aabdc9c..036bace182 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts
@@ -29,10 +29,6 @@
 			reset-delay-us = <1000>;
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -97,14 +93,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 
 	led_spi {
@@ -196,16 +184,6 @@
 	status = "okay";
 };
 
-&gmac0 {
-	nvmem-cells = <&macaddr_art_1006>;
-	nvmem-cell-names = "mac-address";
-};
-
-&gmac1 {
-	nvmem-cells = <&macaddr_art_5006>;
-	nvmem-cell-names = "mac-address";
-};
-
 &nand {
 	pinctrl-0 = <&nand_pins>;
 	pinctrl-names = "default";
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi
index 5bfb758e50..9689bc566f 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi
@@ -30,10 +30,6 @@
 			pinctrl-names = "default";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -120,14 +116,6 @@
 			status = "okay";
 		};
 
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
-
 		leds {
 			compatible = "gpio-leds";
 
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts
index c8112c04fe..dc144a1584 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts
@@ -76,10 +76,6 @@
 			status = "okay";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		crypto at 8e3a000 {
 			status = "okay";
 		};
@@ -87,15 +83,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-			switch_lan_bmp = <0x10>;
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 };
 
@@ -189,10 +176,6 @@
 	status = "okay";
 };
 
-&gmac0 {
-	vlan_tag = <1 0x10>;
-};
-
 &nand {
 	pinctrl-0 = <&nand_pins>;
 	pinctrl-names = "default";
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzbox-7530.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzbox-7530.dts
index 27c7d071dc..af79020121 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzbox-7530.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzbox-7530.dts
@@ -25,10 +25,6 @@
 			status = "okay";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -64,15 +60,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-			qcom,num_gmac = <1>;
-		};
 	};
 
 	keys {
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-1200.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-1200.dts
index 2d20d5928a..459f4a3384 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-1200.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-1200.dts
@@ -59,19 +59,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			switch_mac_mode = <0x3>; /* mac mode for RGMII RMII */
-			switch_lan_bmp = <0x0>; /* lan port bitmap */
-			switch_wan_bmp = <0x10>; /* wan port bitmap */
-		};
-
-		edma at c080000 {
-			status = "okay";
-			phy-mode = "rgmii-id";
-			qcom,num_gmac = <1>;
-			qcom,single-phy;
-		};
 	};
 
 	key {
@@ -265,9 +252,3 @@
 	status = "okay";
 	qcom,ath10k-calibration-variant = "AVM-FRITZRepeater-1200";
 };
-
-&gmac0 {
-	qcom,phy_mdio_addr = <0>;
-	qcom,poll_required = <1>;
-	vlan_tag = <0 0x20>;
-};
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-3000.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-3000.dts
index 2e4bfd69ba..babf07727a 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-3000.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-3000.dts
@@ -25,10 +25,6 @@
 			status = "okay";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -54,18 +50,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-
-			switch_lan_bmp = <0x30>;
-			switch_wan_bmp = <0x02>;
-		};
-
-		edma at c080000 {
-			status = "okay";
-			qcom,num_gmac = <1>;
-		};
 	};
 
 	key {
@@ -210,10 +194,6 @@
 	};
 };
 
-&gmac0 {
-	vlan_tag = <1 0x30>;
-};
-
 &cryptobam {
 	status = "okay";
 };
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-gl-b2200.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-gl-b2200.dts
index 9d7259c354..6fdc361ee7 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-gl-b2200.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-gl-b2200.dts
@@ -27,10 +27,6 @@
 			status = "okay";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -60,16 +56,6 @@
 		crypto at 8e3a000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-			switch_lan_bmp = <0x2e>;
-			switch_wan_bmp = <0x10>;
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 
 	keys {
@@ -113,18 +99,6 @@
 	};
 };
 
-&gmac1 {
-	qcom,phy_mdio_addr = <3>;
-	qcom,poll_required = <1>;
-	qcom,forced_speed = <1000>;
-	qcom,forced_duplex = <1>;
-	vlan_tag = <2 0x10>;
-};
-
-&gmac0 {
-	vlan_tag = <1 0x2e>;
-};
-
 &vqmmc {
 	status = "okay";
 };
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-habanero-dvk.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-habanero-dvk.dts
index 2a2cfb9ac2..c467d85049 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-habanero-dvk.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-habanero-dvk.dts
@@ -29,10 +29,6 @@
 			pinctrl-names = "default";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		counter at 4a1000 {
 			compatible = "qcom,qca-gcnt";
 			reg = <0x4a1000 0x4>;
@@ -79,14 +75,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 
 	keys {
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hap-ac3.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hap-ac3.dts
index c8b7e202fd..c03762eac1 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hap-ac3.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hap-ac3.dts
@@ -73,14 +73,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 
 	keys {
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-lhgg-60ad.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-lhgg-60ad.dts
index aecbb673bf..a91a7fae17 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-lhgg-60ad.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-lhgg-60ad.dts
@@ -85,19 +85,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			switch_mac_mode = <0x3>; /* mac mode for RGMII RMII */
-			switch_lan_bmp = <0x0>; /* lan port bitmap */
-			switch_wan_bmp = <0x10>; /* wan port bitmap */
-		};
-
-		edma at c080000 {
-			status = "okay";
-			phy-mode = "rgmii-id";
-			qcom,num_gmac = <1>;
-			qcom,single-phy;
-		};
 	};
 
 	keys {
@@ -260,9 +247,3 @@
 		};
 	};
 };
-
-&gmac0 {
-	qcom,phy_mdio_addr = <0>;
-	qcom,poll_required = <1>;
-	vlan_tag = <0 0x20>;
-};
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-map-ac2200.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-map-ac2200.dts
index 433048dd4b..94e94beb81 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-map-ac2200.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-map-ac2200.dts
@@ -26,10 +26,6 @@
 			status = "okay";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -59,14 +55,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 
 	keys {
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf286d.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf286d.dts
index 8d1505cfe9..d2a010055c 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf286d.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf286d.dts
@@ -130,14 +130,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 };
 
@@ -225,17 +217,6 @@
 	status = "okay";
 };
 
-&gmac0 {
-	nvmem-cell-names = "mac-address";
-	nvmem-cells = <&macaddr_config_0>;
-};
-
-&gmac1 {
-	nvmem-cell-names = "mac-address";
-	nvmem-cells = <&macaddr_config_0>;
-	mac-address-increment = <1>;
-};
-
 &nand {
 	pinctrl-0 = <&nand_pins>;
 	pinctrl-names = "default";
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-oap100.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-oap100.dts
index bdcc31fef7..beb168eb49 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-oap100.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-oap100.dts
@@ -27,10 +27,6 @@
 			pinctrl-names = "default";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -97,17 +93,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-			switch_mac_mode = <0x0>; /* mac mode for RGMII RMII */
-			switch_initvlas = <0x0007c 0x54>; /* port0 status */
-			switch_lan_bmp = <0x10>;
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 
 	key {
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-orbi.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-orbi.dtsi
index bdbee7f837..4a575b60ee 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-orbi.dtsi
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-orbi.dtsi
@@ -25,10 +25,6 @@
 			pinctrl-names = "default";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		counter at 4a1000 {
 			compatible = "qcom,qca-gcnt";
 			reg = <0x4a1000 0x4>;
@@ -67,17 +63,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-
-			switch_lan_bmp = <0x1c>;
-			switch_wan_bmp = <0x02>;
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 
 	keys {
@@ -281,15 +266,6 @@
 	status = "okay";
 };
 
-&gmac0 {
-	vlan_tag = <1 0x1c>;
-};
-
-&gmac1 {
-	qcom,phy_mdio_addr = <0>;
-	vlan_tag = <2 0x02>;
-};
-
 &pcie0 {
 	status = "okay";
 
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-pa2200.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-pa2200.dts
index 2d0655114b..461f05bc73 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-pa2200.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-pa2200.dts
@@ -21,10 +21,6 @@
 			status = "okay";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -50,17 +46,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			switch_lan_bmp = <0x10>;
-			switch_wan_bmp = <0x20>;
-
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 
 	keys {
@@ -169,14 +154,6 @@
 	status = "okay";
 };
 
-&gmac0 {
-	qcom,phy_mdio_addr = <3>;
-	qcom,poll_required = <1>;
-	qcom,forced_speed = <1000>;
-	qcom,forced_duplex = <1>;
-	vlan_tag = <1 0x10>;
-};
-
 &pcie0 {
 	status = "okay";
 	perst-gpio = <&tlmm 38 GPIO_ACTIVE_LOW>;
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi
index 87e0d103b7..f66c9c86ea 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi
@@ -16,7 +16,6 @@
 		led-failsafe = &led_sys;
 		led-running = &led_sys;
 		led-upgrade = &led_sys;
-		label-mac-device = &gmac0;
 	};
 
 	soc {
@@ -30,10 +29,6 @@
 			pinctrl-names = "default";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -73,14 +68,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 
 	leds {
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rtl30vw.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rtl30vw.dts
index 0caa0255d0..8db7226ce1 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rtl30vw.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rtl30vw.dts
@@ -142,10 +142,6 @@
 			status = "okay";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -187,14 +183,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 };
 
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-u4019.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-u4019.dtsi
index ece80571bd..c7439b87ec 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-u4019.dtsi
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-u4019.dtsi
@@ -21,10 +21,6 @@
 			reset-delay-us = <2000>;
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -87,14 +83,6 @@
 			status = "okay";
 		};
 
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
-
 		aliases {
 			led-boot = &led_status;
 			led-failsafe = &led_status;
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wifi.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wifi.dts
index 9448e5145e..643449f8e4 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wifi.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wifi.dts
@@ -25,20 +25,6 @@
 		device_type = "memory";
 		reg = <0x80000000 0x20000000>; /* 512MB */
 	};
-
-	soc {
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
-
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-	};
 };
 
 &tlmm {
@@ -339,20 +325,6 @@
 	status = "okay";
 };
 
-&gmac0 {
-	qcom,phy_mdio_addr = <4>;
-	qcom,poll_required = <1>;
-	qcom,forced_speed = <1000>;
-	qcom,forced_duplex = <1>;
-	vlan_tag = <2 0x20>;
-};
-
-&gmac1 {
-	qcom,phy_mdio_addr = <3>;
-	qcom,forced_duplex = <1>;
-	vlan_tag = <1 0x10>;
-};
-
 &mdio {
 	status = "okay";
 	pinctrl-0 = <&mdio_pins>;
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wpj419.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wpj419.dts
index 4a4c18322f..ca37884db2 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wpj419.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wpj419.dts
@@ -253,10 +253,6 @@
 			reset-delay-us = <5000>;
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 194b000 {
 			/* select hostmode */
 			compatible = "qcom,tcsr";
@@ -333,16 +329,6 @@
 			status = "okay";
 		};
 
-		ess-switch at c000000 {
-			switch_lan_bmp = <0x1e>;
-			switch_wan_bmp = <0x20>;
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
-
 		qpic_bam: dma at 7984000 {
 			status = "okay";
 		};
@@ -371,22 +357,6 @@
 	status = "okay";
 };
 
-&gmac0 {
-	qcom,phy_mdio_addr = <4>;
-	qcom,poll_required = <1>;
-	qcom,forced_speed = <1000>;
-	qcom,forced_duplex = <1>;
-	vlan_tag = <2 0x20>;
-};
-
-&gmac1 {
-	qcom,phy_mdio_addr = <3>;
-	qcom,poll_required = <1>;
-	qcom,forced_speed = <1000>;
-	qcom,forced_duplex = <1>;
-	vlan_tag = <1 0x10>;
-};
-
 &wifi0 {
 	status = "okay";
 	nvmem-cell-names = "pre-calibration";
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wtr-m2133hp.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wtr-m2133hp.dts
index 1f8c830d90..f1d58ccba9 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wtr-m2133hp.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wtr-m2133hp.dts
@@ -32,7 +32,6 @@
 		led-failsafe = &led_power_orange;
 		led-running = &led_power_white;
 		led-upgrade = &led_power_blue;
-		label-mac-device = &gmac0;
 	};
 
 	soc {
@@ -73,19 +72,6 @@
 			status = "okay";
 		};
 
-		ess-switch at c000000 {
-			status = "okay";
-			switch_lan_bmp = <0x1c>;
-		};
-
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
-
 		usb3 at 8af8800 {
 			status = "okay";
 		};
@@ -438,16 +424,6 @@
 	reset-gpios = <&tlmm 47 GPIO_ACTIVE_LOW>;
 };
 
-&gmac0 {
-	nvmem-cells = <&macaddr_orgdata_20>;
-	nvmem-cell-names = "mac-address";
-};
-
-&gmac1 {
-	nvmem-cells = <&macaddr_orgdata_20>;
-	nvmem-cell-names = "mac-address";
-};
-
 &usb3_ss_phy {
 	status = "okay";
 };
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-x1pro.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-x1pro.dts
index 95a0ded6d9..681300c502 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-x1pro.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-x1pro.dts
@@ -87,17 +87,3 @@
 		};
 	};
 };
-
-&gmac0 {
-	status = "okay";
-
-	mtd-mac-address = <&art 0x5006>;
-	mtd-mac-address-increment = <2>;
-};
-
-&gmac1 {
-	status = "okay";
-
-	mtd-mac-address = <&art 0x5006>;
-	mtd-mac-address-increment = <3>;
-};
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-x1pro.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-x1pro.dtsi
index 4edd88cde0..742bd5b570 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-x1pro.dtsi
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-x1pro.dtsi
@@ -30,10 +30,6 @@
 			reset-delay-us = <2000>;
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -96,14 +92,6 @@
 			status = "okay";
 		};
 
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
-
 		leds {
 			compatible = "gpio-leds";
 			pinctrl-0 = <&led_pins>;
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-xx8300.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-xx8300.dtsi
index 8f971e505c..8c9d1c7f03 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-xx8300.dtsi
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-xx8300.dtsi
@@ -35,10 +35,6 @@
 			status = "okay";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -103,14 +99,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 };
 
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts
index 3892c9bd81..b6ce8c027f 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts
@@ -38,10 +38,6 @@
 			reset-delay-us = <2000>;
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 194b000 {
 			/* select hostmode */
 			compatible = "qcom,tcsr";
@@ -83,17 +79,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			switch_lan_bmp = <0x10>;
-			switch_wan_bmp = <0x20>;
-
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 
 	keys {
@@ -262,22 +247,6 @@
 	status = "okay";
 };
 
-&gmac0 {
-	qcom,phy_mdio_addr = <4>;
-	qcom,poll_required = <1>;
-	qcom,forced_speed = <1000>;
-	qcom,forced_duplex = <1>;
-	vlan_tag = <2 0x20>;
-};
-
-&gmac1 {
-	qcom,phy_mdio_addr = <3>;
-	qcom,poll_required = <1>;
-	qcom,forced_speed = <1000>;
-	qcom,forced_duplex = <1>;
-	vlan_tag = <1 0x10>;
-};
-
 &usb3_ss_phy {
 	status = "okay";
 };
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts
index 201ce97cd9..7978f90eb4 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts
@@ -76,14 +76,6 @@
 			status = "okay";
 		};
 
-		ess-switch at c000000 {
-			status = "okay";
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
-
 		i2c_0: i2c at 78b7000 {
 			pinctrl-0 = <&i2c_0_pins>;
 			pinctrl-names = "default";
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-aruba-glenmorangie.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-aruba-glenmorangie.dtsi
index 0b94aafc83..da2067454c 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-aruba-glenmorangie.dtsi
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-aruba-glenmorangie.dtsi
@@ -64,19 +64,6 @@
 			status = "okay";
 		};
 
-		ess-switch at c000000 {
-			switch_mac_mode = <0x3>; /* mac mode for RGMII RMII */
-			switch_lan_bmp = <0x0>; /* lan port bitmap */
-			switch_wan_bmp = <0x10>; /* wan port bitmap */
-		};
-
-		edma at c080000 {
-			qcom,single-phy;
-			qcom,num_gmac = <1>;
-			phy-mode = "rgmii-id";
-			status = "okay";
-		};
-
 		i2c_0: i2c at 78b7000 {
 			pinctrl-0 = <&i2c_0_pins>;
 			pinctrl-names = "default";
@@ -123,12 +110,6 @@
 	status = "okay";
 };
 
-&gmac0 {
-	qcom,phy_mdio_addr = <5>;
-	qcom,poll_required = <1>;
-	vlan_tag = <0 0x20>;
-};
-
 &qpic_bam {
 	status = "okay";
 };
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
index 6e087ba024..e8a14c9dee 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
@@ -44,10 +44,6 @@
 			status = "okay";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -89,16 +85,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-			switch_lan_bmp = <0x18>;
-			switch_wan_bmp = <0x20>;
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 
 	keys {
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-s1300.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-s1300.dts
index e9490c2690..8ae8658a7e 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-s1300.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-s1300.dts
@@ -30,10 +30,6 @@
 			status = "okay";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -75,16 +71,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-			switch_lan_bmp = <0x18>;
-			switch_wan_bmp = <0x20>;
-		};
-
-		edma at c080000 {
-			status = "okay";
-		};
 	};
 
 	keys {
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-insect-common.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-insect-common.dtsi
index 47646e4b3c..fa755b3873 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-insect-common.dtsi
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-insect-common.dtsi
@@ -86,19 +86,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			switch_mac_mode = <0x3>; /* mac mode for RGMII RMII */
-			switch_lan_bmp = <0x0>; /* lan port bitmap */
-			switch_wan_bmp = <0x10>; /* wan port bitmap */
-		};
-
-		edma at c080000 {
-			qcom,single-phy;
-			qcom,num_gmac = <1>;
-			phy-mode = "rgmii-rxid";
-			status = "okay";
-		};
 	};
 
 	keys {
@@ -136,12 +123,6 @@
 	status = "okay";
 };
 
-&gmac0 {
-	qcom,phy_mdio_addr = <1>;
-	qcom,poll_required = <1>;
-	vlan_tag = <0 0x20>;
-};
-
 &blsp1_i2c3 {
 	pinctrl-0 = <&i2c_0_pins>;
 	pinctrl-names = "default";
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ws-ap3915i.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ws-ap3915i.dts
index c14023559b..423c24b89a 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ws-ap3915i.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ws-ap3915i.dts
@@ -14,7 +14,6 @@
 		led-failsafe = &led_system_amber;
 		led-running = &led_system_green;
 		led-upgrade = &led_system_amber;
-		label-mac-device = &gmac0;
 	};
 
 	soc {
@@ -28,10 +27,6 @@
 			pinctrl-names = "default";
 		};
 
-		ess-psgmii at 98000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -57,17 +52,6 @@
 		watchdog at b017000 {
 			status = "okay";
 		};
-
-		ess-switch at c000000 {
-			status = "okay";
-			switch_lan_bmp = <0x20>;
-			switch_wan_bmp = <0x00>;
-		};
-
-		edma at c080000 {
-			status = "okay";
-			qcom,num_gmac = <1>;
-		};
 	};
 
 	leds {
@@ -262,11 +246,3 @@
 		};
 	};
 };
-
-&gmac0 {
-	qcom,phy_mdio_addr = <4>;
-	qcom,poll_required = <1>;
-	qcom,forced_speed = <1000>;
-	qcom,forced_duplex = <1>;
-	vlan_tag = <1 0x20>;
-};




More information about the lede-commits mailing list