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@sartura.hr>

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 f1bd88f94294254f5bc966e21e6b51ae3919180f..29d51aa9e1c57eb6042de3122d5d83775d13f9f2 100644 (file)
--- 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@0;
-                       /delete-node/ ethernet-phy@1;
                };
 
                crypto@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 ed9996f097ed3258d589fa0675d7c85f1431c61b..2407698fe1c89ea9ade575b115b355e131850fc2 100644 (file)
--- 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@90000 {
                        status = "okay";
-
-                       /delete-node/ ethernet-phy@0;
-                       /delete-node/ ethernet-phy@1;
-                       /delete-node/ ethernet-phy@3;
                };
 
                tcsr@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 459f4a3384f9616160c42ae7faf9219264456fcf..20b981a372e4294920d90ef7a6947e684e86d4ec 100644 (file)
--- 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@1;
-                       /delete-node/ ethernet-phy@2;
-                       /delete-node/ ethernet-phy@3;
-                       /delete-node/ ethernet-phy@4;
-                       /delete-node/ psgmii-phy@5;
                };
 
                tcsr@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 a91a7fae17e55aac7b72ebc44f893a8f2ddac51f..c208bf33eed54d1ebe6f2bd0fb5e5b3e56fd7c80 100644 (file)
--- 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@90000 {
                        status = "okay";
-
-                       /delete-node/ ethernet-phy@1;
-                       /delete-node/ ethernet-phy@2;
-                       /delete-node/ ethernet-phy@3;
-                       /delete-node/ ethernet-phy@4;
-                       /delete-node/ psgmii-phy@5;
                };
 
                counter@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 da2067454c3c3fcfd81d93f62d05e1ce29e2b4fd..0925561ed0fc9799e072d2bca6a4b9caa1ffe5a1 100644 (file)
--- 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@0;
-                       /delete-node/ ethernet-phy@1;
-                       /delete-node/ ethernet-phy@2;
-                       /delete-node/ ethernet-phy@3;
-                       /delete-node/ ethernet-phy@4;
-                       /delete-node/ psgmii-phy@5;
-
                        ethernet-phy@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";