managed = "in-band-status";
label = "wan";
sfp = <&sfp0>;
- pcs-handle = <&pcsuniphy0_ch0>;
+ pcs-handle = <&pcs0_ch0>;
local-mac-address = [00 00 00 00 00 00];
clocks = <&nsscc NSS_CC_PORT1_MAC_CLK>,
<&nsscc NSS_CC_PORT1_RX_CLK>,
phy-mode = "2500base-x";
label = "lan1";
phy-handle = <&phy0>;
- pcs-handle = <&pcsuniphy1_ch0>;
+ pcs-handle = <&pcs1_ch0>;
local-mac-address = [00 00 00 00 00 00];
clocks = <&nsscc NSS_CC_PORT5_MAC_CLK>,
<&nsscc NSS_CC_PORT5_RX_CLK>,
managed = "in-band-status";
label = "lan2";
phy-handle = <&phy1>;
- pcs-handle = <&pcsuniphy2_ch0>;
+ pcs-handle = <&pcs2_ch0>;
local-mac-address = [00 00 00 00 00 00];
clocks = <&nsscc NSS_CC_PORT6_MAC_CLK>,
<&nsscc NSS_CC_PORT6_RX_CLK>,
- <0>,
- <0>,
- <0>,
-+ <&pcs_uniphy0 0>,
-+ <&pcs_uniphy0 1>,
-+ <&pcs_uniphy1 0>,
-+ <&pcs_uniphy1 1>,
-+ <&pcs_uniphy2 0>,
-+ <&pcs_uniphy2 1>,
++ <&pcs0 0>,
++ <&pcs0 1>,
++ <&pcs1 0>,
++ <&pcs1 1>,
++ <&pcs2 0>,
++ <&pcs2 1>,
<&gcc GCC_NSSCC_CLK>;
clock-names = "xo",
"nss_1200",
#interconnect-cells = <1>;
};
+
-+ pcs_uniphy0: ethernet-pcs@7a00000 {
++ pcs0: ethernet-pcs@7a00000 {
+ compatible = "qcom,ipq9574-pcs";
+ reg = <0x7a00000 0x10000>;
+ #address-cells = <1>;
+
+ #clock-cells = <1>;
+
-+ pcsuniphy0_ch0: pcs-mii@0 {
++ pcs0_ch0: pcs-mii@0 {
+ reg = <0>;
+ clocks = <&nsscc NSS_CC_UNIPHY_PORT1_RX_CLK>,
+ <&nsscc NSS_CC_UNIPHY_PORT1_TX_CLK>;
+ "tx";
+ };
+
-+ pcsuniphy0_ch1: pcs-mii@1 {
++ pcs0_ch1: pcs-mii@1 {
+ reg = <1>;
+ clocks = <&nsscc NSS_CC_UNIPHY_PORT2_RX_CLK>,
+ <&nsscc NSS_CC_UNIPHY_PORT2_TX_CLK>;
+ "tx";
+ };
+
-+ pcsuniphy0_ch2: pcs-mii@2 {
++ pcs0_ch2: pcs-mii@2 {
+ reg = <2>;
+ clocks = <&nsscc NSS_CC_UNIPHY_PORT3_RX_CLK>,
+ <&nsscc NSS_CC_UNIPHY_PORT3_TX_CLK>;
+ "tx";
+ };
+
-+ pcsuniphy0_ch3: pcs-mii@3 {
++ pcs0_ch3: pcs-mii@3 {
+ reg = <3>;
+ clocks = <&nsscc NSS_CC_UNIPHY_PORT4_RX_CLK>,
+ <&nsscc NSS_CC_UNIPHY_PORT4_TX_CLK>;
+ };
+ };
+
-+ pcs_uniphy1: ethernet-pcs@7a10000 {
++ pcs1: ethernet-pcs@7a10000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "qcom,ipq9574-pcs";
+ "xpcs";
+ #clock-cells = <1>;
+
-+ pcsuniphy1_ch0: pcs-mii@0 {
++ pcs1_ch0: pcs-mii@0 {
+ reg = <0>;
+ clocks = <&nsscc NSS_CC_UNIPHY_PORT5_RX_CLK>,
+ <&nsscc NSS_CC_UNIPHY_PORT5_TX_CLK>;
+ };
+ };
+
-+ pcs_uniphy2: ethernet-pcs@7a20000 {
++ pcs2: ethernet-pcs@7a20000 {
+ compatible = "qcom,ipq9574-pcs";
+ reg = <0x7a20000 0x10000>;
+ #address-cells = <1>;
+ "xpcs";
+ #clock-cells = <1>;
+
-+ pcsuniphy2_ch0: pcs-mii@0 {
++ pcs2_ch0: pcs-mii@0 {
+ reg = <0>;
+ clocks = <&nsscc NSS_CC_UNIPHY_PORT6_RX_CLK>,
+ <&nsscc NSS_CC_UNIPHY_PORT6_TX_CLK>;
+ "memnoc_nssnoc_1";
+ };
+
- pcs_uniphy0: ethernet-pcs@7a00000 {
+ pcs0: ethernet-pcs@7a00000 {
compatible = "qcom,ipq9574-pcs";
reg = <0x7a00000 0x10000>;
+ };
};
- pcs_uniphy0: ethernet-pcs@7a00000 {
+ pcs0: ethernet-pcs@7a00000 {
+ phy-mode = "qsgmii";
+ managed = "in-band-status";
+ phy-handle = <&phy0>;
-+ pcs-handle = <&pcsuniphy0_ch0>;
++ pcs-handle = <&pcs0_ch0>;
+ clocks = <&nsscc NSS_CC_PORT1_MAC_CLK>,
+ <&nsscc NSS_CC_PORT1_RX_CLK>,
+ <&nsscc NSS_CC_PORT1_TX_CLK>;
+ phy-mode = "qsgmii";
+ managed = "in-band-status";
+ phy-handle = <&phy1>;
-+ pcs-handle = <&pcsuniphy0_ch1>;
++ pcs-handle = <&pcs0_ch1>;
+ clocks = <&nsscc NSS_CC_PORT2_MAC_CLK>,
+ <&nsscc NSS_CC_PORT2_RX_CLK>,
+ <&nsscc NSS_CC_PORT2_TX_CLK>;
+ phy-mode = "qsgmii";
+ managed = "in-band-status";
+ phy-handle = <&phy2>;
-+ pcs-handle = <&pcsuniphy0_ch2>;
++ pcs-handle = <&pcs0_ch2>;
+ clocks = <&nsscc NSS_CC_PORT3_MAC_CLK>,
+ <&nsscc NSS_CC_PORT3_RX_CLK>,
+ <&nsscc NSS_CC_PORT3_TX_CLK>;
+ phy-mode = "qsgmii";
+ managed = "in-band-status";
+ phy-handle = <&phy3>;
-+ pcs-handle = <&pcsuniphy0_ch3>;
++ pcs-handle = <&pcs0_ch3>;
+ clocks = <&nsscc NSS_CC_PORT4_MAC_CLK>,
+ <&nsscc NSS_CC_PORT4_RX_CLK>,
+ <&nsscc NSS_CC_PORT4_TX_CLK>;
+ phy-mode = "usxgmii";
+ managed = "in-band-status";
+ phy-handle = <&phy4>;
-+ pcs-handle = <&pcsuniphy1_ch0>;
++ pcs-handle = <&pcs1_ch0>;
+ clocks = <&nsscc NSS_CC_PORT5_MAC_CLK>,
+ <&nsscc NSS_CC_PORT5_RX_CLK>,
+ <&nsscc NSS_CC_PORT5_TX_CLK>;
+ phy-mode = "usxgmii";
+ managed = "in-band-status";
+ phy-handle = <&phy5>;
-+ pcs-handle = <&pcsuniphy2_ch0>;
++ pcs-handle = <&pcs2_ch0>;
+ clocks = <&nsscc NSS_CC_PORT6_MAC_CLK>,
+ <&nsscc NSS_CC_PORT6_RX_CLK>,
+ <&nsscc NSS_CC_PORT6_TX_CLK>;
managed = "in-band-status";
+ label = "lan1";
phy-handle = <&phy0>;
- pcs-handle = <&pcsuniphy0_ch0>;
+ pcs-handle = <&pcs0_ch0>;
clocks = <&nsscc NSS_CC_PORT1_MAC_CLK>,
@@ -237,6 +238,7 @@
reg = <2>;
managed = "in-band-status";
+ label = "lan2";
phy-handle = <&phy1>;
- pcs-handle = <&pcsuniphy0_ch1>;
+ pcs-handle = <&pcs0_ch1>;
clocks = <&nsscc NSS_CC_PORT2_MAC_CLK>,
@@ -257,6 +259,7 @@
reg = <3>;
managed = "in-band-status";
+ label = "lan3";
phy-handle = <&phy2>;
- pcs-handle = <&pcsuniphy0_ch2>;
+ pcs-handle = <&pcs0_ch2>;
clocks = <&nsscc NSS_CC_PORT3_MAC_CLK>,
@@ -277,6 +280,7 @@
reg = <4>;
managed = "in-band-status";
+ label = "lan4";
phy-handle = <&phy3>;
- pcs-handle = <&pcsuniphy0_ch3>;
+ pcs-handle = <&pcs0_ch3>;
clocks = <&nsscc NSS_CC_PORT4_MAC_CLK>,
@@ -297,6 +301,7 @@
reg = <5>;
managed = "in-band-status";
+ label = "lan5";
phy-handle = <&phy4>;
- pcs-handle = <&pcsuniphy1_ch0>;
+ pcs-handle = <&pcs1_ch0>;
clocks = <&nsscc NSS_CC_PORT5_MAC_CLK>,
@@ -317,6 +322,7 @@
reg = <6>;
managed = "in-band-status";
+ label = "wan";
phy-handle = <&phy5>;
- pcs-handle = <&pcsuniphy2_ch0>;
+ pcs-handle = <&pcs2_ch0>;
clocks = <&nsscc NSS_CC_PORT6_MAC_CLK>,
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
@@ -1255,7 +1255,10 @@
- <&pcs_uniphy1 1>,
- <&pcs_uniphy2 0>,
- <&pcs_uniphy2 1>,
+ <&pcs1 1>,
+ <&pcs2 0>,
+ <&pcs2 1>,
- <&gcc GCC_NSSCC_CLK>;
+ <&gcc GCC_NSSCC_CLK>,
+ <&gcc GCC_NSSNOC_NSSCC_CLK>,
projects / openwrt / staging / xback.git / commitdiff