ipq40xx: fixup remaining devices that dont use QCA807x PHY

Like AVM 1200 these devices also do not use QCA807x PHY at all and thus
they disables all of the individual PHY nodes, however this is not enough
anymore since the conversion to PHY package.

Now its now enough to disable the PHY-s in the package alone, but the PHY
package node itself must also be disabled.

Fixes: 1b931c33a28e ("ipq40xx: adapt to new Upstream QCA807x PHY driver")
Link: https://github.com/openwrt/openwrt/pull/15444
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-lhgg-60ad.dts b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-lhgg-60ad.dts
index b3eb610b329f8cf69f82bb50fa6e7bf31a4d9f6a..a5b55ff421f4dc429290bd43dc8087cd46b4a0de 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-lhgg-60ad.dts
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-lhgg-60ad.dts
@@ -243,6 +243,18 @@
 
 &mdio {
        status = "okay";
+
+       ar8035: ethernet-phy@0 {
+               reg = <0>;
+       };
+};
+
+&qca807x {
+       status = "disabled";
+};
+
+&ethphy0 {
+       status = "disabled";
 };
 
 &ethphy1 {
@@ -279,6 +291,6 @@
        status = "okay";
 
        label = "lan";
-       phy-handle = <&ethphy0>;
+       phy-handle = <&ar8035>;
        phy-mode = "rgmii-id";
 };

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-aruba-glenmorangie.dtsi b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-aruba-glenmorangie.dtsi
index 8c56c7d2f12326a51b40faddaf3676aa74d10595..7f8f9be7956790b26a92e29787a8f8f0fde520c2 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-aruba-glenmorangie.dtsi
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-aruba-glenmorangie.dtsi
@@ -232,6 +232,10 @@
        phy-mode = "rgmii-id";
 };
 
+&qca807x {
+       status = "disabled";
+};
+
 &ethphy0 {
        status = "disabled";
 };

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-insect-common.dtsi b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-insect-common.dtsi
index da22d4a67139d9ea618e4100318b484bc203112e..3637b96d24dae90323a462175c84abd43c335e3d 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-insect-common.dtsi
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-insect-common.dtsi
@@ -401,6 +401,10 @@
        status = "okay";
        pinctrl-0 = <&mdio_pins>;
        pinctrl-names = "default";
+
+       ar8035: ethernet-phy@1 {
+               reg = <1>;
+       };
 };
 
 &gmac {
@@ -419,14 +423,22 @@
        status = "okay";
 
        label = "lan";
-       phy-handle = <&ethphy1>;
+       phy-handle = <&ar8035>;
        phy-mode = "rgmii-rxid";
 };
 
+&qca807x {
+       status = "disabled";
+};
+
 &ethphy0 {
        status = "disabled";
 };
 
+&ethphy1 {
+       status = "disabled";
+};
+
 &ethphy2 {
        status = "disabled";
 };