[openwrt/openwrt] qualcommax: convert qca807x PHY to PHY package implementation
LEDE Commits
lede-commits at lists.infradead.org
Sun Feb 11 12:18:08 PST 2024
ansuel pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/0ab4b9201e44f244383b7b77d6032b400c75ecb5
commit 0ab4b9201e44f244383b7b77d6032b400c75ecb5
Author: Christian Marangi <ansuelsmth at gmail.com>
AuthorDate: Fri Nov 17 17:52:42 2023 +0100
qualcommax: convert qca807x PHY to PHY package implementation
Convert every qca807x PHY definition in DT to new PHY package
implementation to correctly support applying fixup for the correct PHY
mode.
Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
.../arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts | 15 ++++++--
.../arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi | 37 ++++++++++--------
.../arch/arm64/boot/dts/qcom/ipq8072-301w.dts | 41 +++++++++++++-------
.../arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts | 41 +++++++++++++-------
.../arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts | 41 +++++++++++++-------
.../arch/arm64/boot/dts/qcom/ipq8072-haze.dts | 43 ++++++++++++---------
.../arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts | 29 ++++++++------
.../arch/arm64/boot/dts/qcom/ipq8074-ess.dtsi | 2 +-
.../arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts | 45 +++++++++++++---------
.../arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts | 44 ++++++++++++---------
.../arch/arm64/boot/dts/qcom/ipq8074-wax630.dts | 15 ++++++--
.../arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts | 35 +++++++++++------
12 files changed, 244 insertions(+), 144 deletions(-)
diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts
index 0ca2edcb2c..e62ae314fb 100644
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts
@@ -262,9 +262,16 @@
reset-gpios = <&tlmm 37 GPIO_ACTIVE_LOW>;
- qca8075: ethernet-phy at 4 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <4>;
+ ethernet-phy-package at 0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "qcom,qca8075-package";
+ reg = <0>;
+
+ qca8075_4: ethernet-phy at 4 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <4>;
+ };
};
};
@@ -288,7 +295,7 @@
&dp5 {
status = "okay";
- phy-handle = <&qca8075>;
+ phy-handle = <&qca8075_4>;
label = "lan";
};
diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi
index 2bb2cce157..6afafb3554 100644
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi
@@ -213,24 +213,31 @@
pinctrl-names = "default";
reset-gpios = <&tlmm 37 GPIO_ACTIVE_LOW>;
- qca8075_1: ethernet-phy at 1 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <1>;
- };
+ ethernet-phy-package at 0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "qcom,qca8075-package";
+ reg = <0>;
- qca8075_2: ethernet-phy at 2 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <2>;
- };
+ qca8075_1: ethernet-phy at 1 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <1>;
+ };
- qca8075_3: ethernet-phy at 3 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <3>;
- };
+ qca8075_2: ethernet-phy at 2 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <2>;
+ };
+
+ qca8075_3: ethernet-phy at 3 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <3>;
+ };
- qca8075_4: ethernet-phy at 4 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <4>;
+ qca8075_4: ethernet-phy at 4 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <4>;
+ };
};
};
diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts
index 497a18714a..4dcacdf297 100644
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts
@@ -366,24 +366,33 @@
nvmem-cells = <&aqr1_fw>;
};
- qca8075_16: ethernet-phy at 16 {
- compatible = "ethernet-phy-ieee802.3-c22";
+ ethernet-phy-package at 16 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "qcom,qca8075-package";
reg = <16>;
- };
- qca8075_17: ethernet-phy at 17 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <17>;
- };
+ qcom,package-mode = "qsgmii";
- qca8075_18: ethernet-phy at 18 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <18>;
- };
+ qca8075_16: ethernet-phy at 16 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <16>;
+ };
- qca8075_19: ethernet-phy at 19 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <19>;
+ qca8075_17: ethernet-phy at 17 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <17>;
+ };
+
+ qca8075_18: ethernet-phy at 18 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <18>;
+ };
+
+ qca8075_19: ethernet-phy at 19 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <19>;
+ };
};
};
@@ -448,24 +457,28 @@
&dp1 {
status = "okay";
+ phy-mode = "qsgmii";
phy-handle = <&qca8075_16>;
label = "lan4";
};
&dp2 {
status = "okay";
+ phy-mode = "qsgmii";
phy-handle = <&qca8075_17>;
label = "lan3";
};
&dp3 {
status = "okay";
+ phy-mode = "qsgmii";
phy-handle = <&qca8075_18>;
label = "lan2";
};
&dp4 {
status = "okay";
+ phy-mode = "qsgmii";
phy-handle = <&qca8075_19>;
label = "lan1";
};
diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts
index d6be71b8cf..c0c21f6d79 100644
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts
@@ -347,24 +347,33 @@
pinctrl-names = "default";
reset-gpios = <&tlmm 37 GPIO_ACTIVE_LOW>;
- qca8075_0: ethernet-phy at 0 {
- compatible = "ethernet-phy-ieee802.3-c22";
+ ethernet-phy-package at 0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "qcom,qca8075-package";
reg = <0>;
- };
- qca8075_1: ethernet-phy at 1 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <1>;
- };
+ qcom,package-mode = "qsgmii";
- qca8075_2: ethernet-phy at 2 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <2>;
- };
+ qca8075_0: ethernet-phy at 0 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <0>;
+ };
- qca8075_3: ethernet-phy at 3 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <3>;
+ qca8075_1: ethernet-phy at 1 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <1>;
+ };
+
+ qca8075_2: ethernet-phy at 2 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <2>;
+ };
+
+ qca8075_3: ethernet-phy at 3 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <3>;
+ };
};
qca8081: ethernet-phy at 24 {
@@ -426,6 +435,7 @@
&dp1 {
status = "okay";
+ phy-mode = "qsgmii";
phy-handle = <&qca8075_0>;
label = "lan4";
nvmem-cells = <&macaddr_dp1>;
@@ -434,6 +444,7 @@
&dp2 {
status = "okay";
+ phy-mode = "qsgmii";
phy-handle = <&qca8075_1>;
label = "lan3";
nvmem-cells = <&macaddr_dp2>;
@@ -442,6 +453,7 @@
&dp3 {
status = "okay";
+ phy-mode = "qsgmii";
phy-handle = <&qca8075_2>;
label = "lan2";
nvmem-cells = <&macaddr_dp3>;
@@ -450,6 +462,7 @@
&dp4 {
status = "okay";
+ phy-mode = "qsgmii";
phy-handle = <&qca8075_3>;
label = "lan1";
nvmem-cells = <&macaddr_dp4>;
diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts
index 66a14232d7..c5c089c00f 100644
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts
@@ -137,24 +137,33 @@
pinctrl-names = "default";
reset-gpios = <&tlmm 37 GPIO_ACTIVE_LOW>;
- qca8075_0: ethernet-phy at 0 {
- compatible = "ethernet-phy-ieee802.3-c22";
+ ethernet-phy-package at 0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "qcom,qca8075-package";
reg = <0>;
- };
- qca8075_1: ethernet-phy at 1 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <1>;
- };
+ qcom,package-mode = "qsgmii";
- qca8075_2: ethernet-phy at 2 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <2>;
- };
+ qca8075_0: ethernet-phy at 0 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <0>;
+ };
- qca8075_3: ethernet-phy at 3 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <3>;
+ qca8075_1: ethernet-phy at 1 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <1>;
+ };
+
+ qca8075_2: ethernet-phy at 2 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <2>;
+ };
+
+ qca8075_3: ethernet-phy at 3 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <3>;
+ };
};
qca8081: ethernet-phy at 28 {
@@ -223,24 +232,28 @@
&dp1 {
status = "okay";
+ phy-mode = "qsgmii";
phy-handle = <&qca8075_0>;
label = "lan4";
};
&dp2 {
status = "okay";
+ phy-mode = "qsgmii";
phy-handle = <&qca8075_1>;
label = "lan3";
};
&dp3 {
status = "okay";
+ phy-mode = "qsgmii";
phy-handle = <&qca8075_2>;
label = "lan2";
};
&dp4 {
status = "okay";
+ phy-mode = "qsgmii";
phy-handle = <&qca8075_3>;
label = "lan1";
};
diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts
index 8fdfe981f9..70cc2921c7 100644
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts
@@ -161,24 +161,31 @@
pinctrl-names = "default";
reset-gpios = <&tlmm 22 GPIO_ACTIVE_LOW>;
- qca8075_1: ethernet-phy at 0 {
- compatible = "ethernet-phy-ieee802.3-c22";
+ ethernet-phy-package at 0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "qcom,qca8075-package";
reg = <0>;
- };
- qca8075_2: ethernet-phy at 1 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <1>;
- };
+ qca8075_0: ethernet-phy at 0 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <0>;
+ };
- qca8075_3: ethernet-phy at 2 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <2>;
- };
+ qca8075_1: ethernet-phy at 1 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <1>;
+ };
- qca8075_4: ethernet-phy at 3 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <3>;
+ qca8075_2: ethernet-phy at 2 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <2>;
+ };
+
+ qca8075_3: ethernet-phy at 3 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <3>;
+ };
};
aqr113c: ethernet-phy at 5 {
@@ -236,25 +243,25 @@
/* Dummy LAN port */
&dp1 {
status = "disabled";
- phy-handle = <&qca8075_1>;
+ phy-handle = <&qca8075_0>;
label = "lan4";
};
&dp2 {
status = "okay";
- phy-handle = <&qca8075_2>;
+ phy-handle = <&qca8075_1>;
label = "lan3";
};
&dp3 {
status = "okay";
- phy-handle = <&qca8075_3>;
+ phy-handle = <&qca8075_2>;
label = "lan2";
};
&dp4 {
status = "okay";
- phy-handle = <&qca8075_4>;
+ phy-handle = <&qca8075_3>;
label = "lan1";
};
diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts
index e4bd72c532..7d7f54ea62 100644
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts
@@ -357,19 +357,26 @@
pinctrl-names = "default";
reset-gpios = <&tlmm 37 GPIO_ACTIVE_LOW>;
- qca8075_1: ethernet-phy at 1 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <1>;
- };
+ ethernet-phy-package at 0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "qcom,qca8075-package";
+ reg = <0>;
- qca8075_2: ethernet-phy at 2 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <2>;
- };
+ qca8075_1: ethernet-phy at 1 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <1>;
+ };
- qca8075_3: ethernet-phy at 3 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <3>;
+ qca8075_2: ethernet-phy at 2 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <2>;
+ };
+
+ qca8075_3: ethernet-phy at 3 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <3>;
+ };
};
qca8081: ethernet-phy at 28 {
diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-ess.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-ess.dtsi
index a1e2d01e8f..6f98e01b9a 100644
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-ess.dtsi
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-ess.dtsi
@@ -520,7 +520,7 @@
reg = <0x3a001800 0x200>;
qcom,mactype = <0>;
local-mac-address = [000000000000];
- phy-mode = "sgmii";
+ phy-mode = "psgmii";
status = "disabled";
};
diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts
index be6953f942..5d7d84ac52 100644
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts
@@ -271,27 +271,34 @@
pinctrl-names = "default";
reset-gpios = <&tlmm 37 GPIO_ACTIVE_LOW>;
- qca8075_1: ethernet-phy at 0 {
- compatible = "ethernet-phy-ieee802.3-c22";
+ ethernet-phy-package at 0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "qcom,qca8075-package";
reg = <0>;
- };
- qca8075_2: ethernet-phy at 1 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <1>;
- };
+ qca8075_0: ethernet-phy at 0 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <0>;
+ };
- qca8075_3: ethernet-phy at 2 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <2>;
- };
+ qca8075_1: ethernet-phy at 1 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <1>;
+ };
+
+ qca8075_2: ethernet-phy at 2 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <2>;
+ };
- qca8075_4: ethernet-phy at 3 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <3>;
+ qca8075_3: ethernet-phy at 3 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <3>;
+ };
};
- qca8081: ethernet-phy at 4{
+ qca8081: ethernet-phy at 28 {
compatible = "ethernet-phy-id004d.d101";
reg = <28>;
reset-deassert-us = <10000>;
@@ -358,7 +365,7 @@
&dp1 {
status = "okay";
- phy-handle = <&qca8075_1>;
+ phy-handle = <&qca8075_0>;
label = "lan1";
nvmem-cells = <&macaddr_lan 0>;
nvmem-cell-names = "mac-address";
@@ -366,7 +373,7 @@
&dp2 {
status = "okay";
- phy-handle = <&qca8075_2>;
+ phy-handle = <&qca8075_1>;
label = "lan2";
nvmem-cells = <&macaddr_lan 0>;
nvmem-cell-names = "mac-address";
@@ -374,7 +381,7 @@
&dp3 {
status = "okay";
- phy-handle = <&qca8075_3>;
+ phy-handle = <&qca8075_2>;
label = "lan3";
nvmem-cells = <&macaddr_lan 0>;
nvmem-cell-names = "mac-address";
@@ -382,7 +389,7 @@
&dp4 {
status = "okay";
- phy-handle = <&qca8075_4>;
+ phy-handle = <&qca8075_3>;
label = "lan4";
nvmem-cells = <&macaddr_lan 0>;
nvmem-cell-names = "mac-address";
diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts
index 39e0cfabf7..5b9a45e961 100644
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts
@@ -150,29 +150,37 @@
pinctrl-names = "default";
reset-gpios = <&tlmm 37 GPIO_ACTIVE_LOW>;
- qca8075_0: ethernet-phy at 0 {
- compatible = "ethernet-phy-ieee802.3-c22";
+ ethernet-phy-package at 0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
reg = <0>;
- };
- qca8075_1: ethernet-phy at 1 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <1>;
- };
+ compatible = "qcom,qca8075-package";
- qca8075_2: ethernet-phy at 2 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <2>;
- };
+ qca8075_0: ethernet-phy at 0 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <0>;
+ };
- qca8075_3: ethernet-phy at 3 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <3>;
- };
+ qca8075_1: ethernet-phy at 1 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <1>;
+ };
+
+ qca8075_2: ethernet-phy at 2 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <2>;
+ };
- qca8075_4: ethernet-phy at 4 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <4>;
+ qca8075_3: ethernet-phy at 3 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <3>;
+ };
+
+ qca8075_4: ethernet-phy at 4 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <4>;
+ };
};
aqr111b0: ethernet-phy at 7 {
diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wax630.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wax630.dts
index 48b1fee1ea..91561e5c2a 100644
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wax630.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wax630.dts
@@ -194,9 +194,16 @@
pinctrl-names = "default";
reset-gpios = <&tlmm 37 GPIO_ACTIVE_LOW>;
- qca8075: ethernet-phy at 3 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <3>;
+ ethernet-phy-package at 0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "qcom,qca8075-package";
+ reg = <0>;
+
+ qca8075_3: ethernet-phy at 3 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <3>;
+ };
};
qca8081: ethernet-phy at 28 {
@@ -209,7 +216,7 @@
&dp4 {
status = "okay";
- phy-handle = <&qca8075>;
+ phy-handle = <&qca8075_3>;
label = "lan2";
};
diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts
index cc6eafe532..a0631b3b71 100644
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts
@@ -230,19 +230,28 @@
reg = <0x8>;
};
- qca8075_1: ethernet-phy at 19 {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <0x19>;
- };
+ ethernet-phy-package at 17 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "qcom,qca8075-package";
+ reg = <0x18>;
- qca8075_2: ethernet-phy at 1a {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <0x1a>;
- };
+ qcom,package-mode = "qsgmii";
+
+ qca8075_1: ethernet-phy at 19 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <0x19>;
+ };
- qca8075_3: ethernet-phy at 1b {
- compatible = "ethernet-phy-ieee802.3-c22";
- reg = <0x1b>;
+ qca8075_2: ethernet-phy at 1a {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <0x1a>;
+ };
+
+ qca8075_3: ethernet-phy at 1b {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <0x1b>;
+ };
};
};
@@ -251,7 +260,6 @@
switch_lan_bmp = <(ESS_PORT2 | ESS_PORT3 | ESS_PORT4 | ESS_PORT6)>;
switch_wan_bmp = <ESS_PORT5>;
- malibu_first_phy_addr = <0x18>;
switch_mac_mode = <MAC_MODE_QSGMII>;
switch_mac_mode1 = <MAC_MODE_USXGMII>;
switch_mac_mode2 = <MAC_MODE_USXGMII>;
@@ -292,6 +300,7 @@
&dp2 {
status = "okay";
+ phy-mode = "qsgmii";
phy-handle = <&qca8075_1>;
label = "lan4";
nvmem-cells = <&macaddr_appsblenv_ethaddr>;
@@ -300,6 +309,7 @@
&dp3 {
status = "okay";
+ phy-mode = "qsgmii";
phy-handle = <&qca8075_2>;
label = "lan3";
nvmem-cells = <&macaddr_appsblenv_ethaddr>;
@@ -308,6 +318,7 @@
&dp4 {
status = "okay";
+ phy-mode = "qsgmii";
phy-handle = <&qca8075_3>;
label = "lan2";
nvmem-cells = <&macaddr_appsblenv_ethaddr>;
More information about the lede-commits
mailing list