[openwrt/openwrt] ipq40xx: disable nodes instead of deleting them

[LEDE Commits]

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

commit ccd08ef9128342b66fe4801b74c56e8e275f7f0a
Author: Robert Marko <robert.marko at sartura.hr>
AuthorDate: Wed Dec 8 14:44:05 2021 +0100

    ipq40xx: disable nodes instead of deleting them
    
    There is no reason to delete the DT PHY nodes
    as you can just disable them.
    
    Signed-off-by: Robert Marko <robert.marko at sartura.hr>
---
 .../boot/dts/qcom-ipq4018-magic-2-wifi-next.dts    | 11 +++++---
 .../arch/arm/boot/dts/qcom-ipq4018-wrtq-329acn.dts | 16 ++++++++---
 .../boot/dts/qcom-ipq4019-fritzrepeater-1200.dts   | 30 ++++++++++++++++-----
 .../arch/arm/boot/dts/qcom-ipq4019-lhgg-60ad.dts   | 26 +++++++++++++-----
 .../boot/dts/qcom-ipq4029-aruba-glenmorangie.dtsi  | 31 +++++++++++++++++-----
 5 files changed, 88 insertions(+), 26 deletions(-)

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 f1bd88f942..29d51aa9e1 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
@@ -24,9 +24,6 @@
 			pinctrl-names = "default";
 			reset-gpios = <&tlmm 59 GPIO_ACTIVE_LOW>;
 			reset-delay-us = <2000>;
-
-			/delete-node/ ethernet-phy at 0;
-			/delete-node/ ethernet-phy at 1;
 		};
 
 		crypto at 8e3a000 {
@@ -152,6 +149,14 @@
 	status = "okay";
 };
 
+&ethphy0 {
+	status = "disabled";
+};
+
+&ethphy1 {
+	status = "disabled";
+};
+
 &wifi0 {
 	status = "okay";
 	qcom,ath10k-calibration-variant = "devolo,magic-2-wifi-next";
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 ed9996f097..2407698fe1 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
@@ -47,10 +47,6 @@
 
 		mdio at 90000 {
 			status = "okay";
-
-			/delete-node/ ethernet-phy at 0;
-			/delete-node/ ethernet-phy at 1;
-			/delete-node/ ethernet-phy at 3;
 		};
 
 		tcsr at 1949000 {
@@ -256,6 +252,18 @@
 	status = "okay";
 };
 
+&ethphy0 {
+	status = "disabled";
+};
+
+&ethphy1 {
+	status = "disabled";
+};
+
+&ethphy3 {
+	status = "disabled";
+};
+
 &wifi0 {
 	status = "okay";
 	nvmem-cell-names = "pre-calibration";
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 459f4a3384..20b981a372 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
@@ -26,12 +26,6 @@
 			status = "okay";
 			pinctrl-0 = <&mdio_pins>;
 			pinctrl-names = "default";
-
-			/delete-node/ ethernet-phy at 1;
-			/delete-node/ ethernet-phy at 2;
-			/delete-node/ ethernet-phy at 3;
-			/delete-node/ ethernet-phy at 4;
-			/delete-node/ psgmii-phy at 5;
 		};
 
 		tcsr at 1949000 {
@@ -243,6 +237,30 @@
 	status = "okay";
 };
 
+&ethphy0 {
+	status = "disabled";
+};
+
+&ethphy1 {
+	status = "disabled";
+};
+
+&ethphy2 {
+	status = "disabled";
+};
+
+&ethphy3 {
+	status = "disabled";
+};
+
+&ethphy4 {
+	status = "disabled";
+};
+
+&psgmiiphy {
+	status = "disabled";
+};
+
 &wifi0 {
 	status = "okay";
 	qcom,ath10k-calibration-variant = "AVM-FRITZRepeater-1200";
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 a91a7fae17..c208bf33ee 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
@@ -47,12 +47,6 @@
 
 		mdio at 90000 {
 			status = "okay";
-
-			/delete-node/ ethernet-phy at 1;
-			/delete-node/ ethernet-phy at 2;
-			/delete-node/ ethernet-phy at 3;
-			/delete-node/ ethernet-phy at 4;
-			/delete-node/ psgmii-phy at 5;
 		};
 
 		counter at 4a1000 {
@@ -247,3 +241,23 @@
 		};
 	};
 };
+
+&ethphy1 {
+	status = "disabled";
+};
+
+&ethphy2 {
+	status = "disabled";
+};
+
+&ethphy3 {
+	status = "disabled";
+};
+
+&ethphy4 {
+	status = "disabled";
+};
+
+&psgmiiphy {
+	status = "disabled";
+};
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 da2067454c..0925561ed0 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
@@ -21,13 +21,6 @@
 			pinctrl-0 = <&mdio_pins>;
 			pinctrl-names = "default";
 
-			/delete-node/ ethernet-phy at 0;
-			/delete-node/ ethernet-phy at 1;
-			/delete-node/ ethernet-phy at 2;
-			/delete-node/ ethernet-phy at 3;
-			/delete-node/ ethernet-phy at 4;
-			/delete-node/ psgmii-phy at 5;
-
 			ethernet-phy at 5 {
 				reg = <0x5>;
 			};
@@ -221,6 +214,30 @@
 	};
 };
 
+&ethphy0 {
+	status = "disabled";
+};
+
+&ethphy1 {
+	status = "disabled";
+};
+
+&ethphy2 {
+	status = "disabled";
+};
+
+&ethphy3 {
+	status = "disabled";
+};
+
+&ethphy4 {
+	status = "disabled";
+};
+
+&psgmiiphy {
+	status = "disabled";
+};
+
 &wifi0 {
 	status = "okay";
 	nvmem-cell-names = "pre-calibration", "mac-address";