Skip to content

L
linux
Commit 4e31b808 authored by Sean Anderson's avatar Sean Anderson Committed by David S. Miller
Browse files
Options

powerpc: dts: qoriq: Add nodes for QSGMII PCSs 

Now that we actually read registers from QSGMII PCSs, it's important
that we have the correct address (instead of hoping that we're the MAC
with all the QSGMII PCSs on its bus). This adds nodes for the QSGMII
PCSs. They have the same addresses on all SoCs (e.g. if QSGMIIA is
present it's used for MACs 1 through 4).

Since the first QSGMII PCSs share an address with the SGMII and XFI
PCSs, we only add new nodes for PCSs 2-4. This avoids address conflicts
on the bus.
Signed-off-by: default avatarSean Anderson <sean.anderson@seco.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 36926a7d
Hide whitespace changes
Inline Side-by-side
Showing with 131 additions and 20 deletions
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0-best-effort.dtsi
View file @ 4e31b808
...@@ -55,7 +55,8 @@ ethernet@e0000 { ...@@ -55,7 +55,8 @@ ethernet@e0000 {
reg = <0xe0000 0x1000>; reg = <0xe0000 0x1000>;
fsl,fman-ports = <&fman0_rx_0x08 &fman0_tx_0x28>; fsl,fman-ports = <&fman0_rx_0x08 &fman0_tx_0x28>;
ptp-timer = <&ptp_timer0>; ptp-timer = <&ptp_timer0>;
pcsphy-handle = <&pcsphy0>; pcsphy-handle = <&pcsphy0>, <&pcsphy0>;
pcs-handle-names = "sgmii", "qsgmii";
}; };
mdio@e1000 { mdio@e1000 {
......
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0.dtsi
View file @ 4e31b808
...@@ -52,7 +52,15 @@ ethernet@f0000 { ...@@ -52,7 +52,15 @@ ethernet@f0000 {
compatible = "fsl,fman-memac"; compatible = "fsl,fman-memac";
reg = <0xf0000 0x1000>; reg = <0xf0000 0x1000>;
fsl,fman-ports = <&fman0_rx_0x10 &fman0_tx_0x30>; fsl,fman-ports = <&fman0_rx_0x10 &fman0_tx_0x30>;
pcsphy-handle = <&pcsphy6>; pcsphy-handle = <&pcsphy6>, <&qsgmiib_pcs2>, <&pcsphy6>;
pcs-handle-names = "sgmii", "qsgmii", "xfi";
};
mdio@e9000 {
qsgmiib_pcs2: ethernet-pcs@2 {
compatible = "fsl,lynx-pcs";
reg = <2>;
};
}; };
mdio@f1000 { mdio@f1000 {
......
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1-best-effort.dtsi
View file @ 4e31b808
...@@ -55,7 +55,15 @@ ethernet@e2000 { ...@@ -55,7 +55,15 @@ ethernet@e2000 {
reg = <0xe2000 0x1000>; reg = <0xe2000 0x1000>;
fsl,fman-ports = <&fman0_rx_0x09 &fman0_tx_0x29>; fsl,fman-ports = <&fman0_rx_0x09 &fman0_tx_0x29>;
ptp-timer = <&ptp_timer0>; ptp-timer = <&ptp_timer0>;
pcsphy-handle = <&pcsphy1>; pcsphy-handle = <&pcsphy1>, <&qsgmiia_pcs1>;
pcs-handle-names = "sgmii", "qsgmii";
};
mdio@e1000 {
qsgmiia_pcs1: ethernet-pcs@1 {
compatible = "fsl,lynx-pcs";
reg = <1>;
};
}; };
mdio@e3000 { mdio@e3000 {
......
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1.dtsi
View file @ 4e31b808
...@@ -52,7 +52,15 @@ ethernet@f2000 { ...@@ -52,7 +52,15 @@ ethernet@f2000 {
compatible = "fsl,fman-memac"; compatible = "fsl,fman-memac";
reg = <0xf2000 0x1000>; reg = <0xf2000 0x1000>;
fsl,fman-ports = <&fman0_rx_0x11 &fman0_tx_0x31>; fsl,fman-ports = <&fman0_rx_0x11 &fman0_tx_0x31>;
pcsphy-handle = <&pcsphy7>; pcsphy-handle = <&pcsphy7>, <&qsgmiib_pcs3>, <&pcsphy7>;
pcs-handle-names = "sgmii", "qsgmii", "xfi";
};
mdio@e9000 {
qsgmiib_pcs3: ethernet-pcs@3 {
compatible = "fsl,lynx-pcs";
reg = <3>;
};
}; };
mdio@f3000 { mdio@f3000 {
......
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi
View file @ 4e31b808
...@@ -27,7 +27,8 @@ ethernet@e0000 { ...@@ -27,7 +27,8 @@ ethernet@e0000 {
reg = <0xe0000 0x1000>; reg = <0xe0000 0x1000>;
fsl,fman-ports = <&fman0_rx_0x08 &fman0_tx_0x28>; fsl,fman-ports = <&fman0_rx_0x08 &fman0_tx_0x28>;
ptp-timer = <&ptp_timer0>; ptp-timer = <&ptp_timer0>;
pcsphy-handle = <&pcsphy0>; pcsphy-handle = <&pcsphy0>, <&pcsphy0>;
pcs-handle-names = "sgmii", "xfi";
}; };
mdio@e1000 { mdio@e1000 {
......
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi
View file @ 4e31b808
...@@ -27,7 +27,8 @@ ethernet@e2000 { ...@@ -27,7 +27,8 @@ ethernet@e2000 {
reg = <0xe2000 0x1000>; reg = <0xe2000 0x1000>;
fsl,fman-ports = <&fman0_rx_0x09 &fman0_tx_0x29>; fsl,fman-ports = <&fman0_rx_0x09 &fman0_tx_0x29>;
ptp-timer = <&ptp_timer0>; ptp-timer = <&ptp_timer0>;
pcsphy-handle = <&pcsphy1>; pcsphy-handle = <&pcsphy1>, <&pcsphy1>;
pcs-handle-names = "sgmii", "xfi";
}; };
mdio@e3000 { mdio@e3000 {
......
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-0.dtsi
View file @ 4e31b808
...@@ -51,7 +51,8 @@ ethernet@e0000 { ...@@ -51,7 +51,8 @@ ethernet@e0000 {
reg = <0xe0000 0x1000>; reg = <0xe0000 0x1000>;
fsl,fman-ports = <&fman0_rx_0x08 &fman0_tx_0x28>; fsl,fman-ports = <&fman0_rx_0x08 &fman0_tx_0x28>;
ptp-timer = <&ptp_timer0>; ptp-timer = <&ptp_timer0>;
pcsphy-handle = <&pcsphy0>; pcsphy-handle = <&pcsphy0>, <&pcsphy0>;
pcs-handle-names = "sgmii", "qsgmii";
}; };
mdio@e1000 { mdio@e1000 {
......
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-1.dtsi
View file @ 4e31b808
...@@ -51,7 +51,15 @@ ethernet@e2000 { ...@@ -51,7 +51,15 @@ ethernet@e2000 {
reg = <0xe2000 0x1000>; reg = <0xe2000 0x1000>;
fsl,fman-ports = <&fman0_rx_0x09 &fman0_tx_0x29>; fsl,fman-ports = <&fman0_rx_0x09 &fman0_tx_0x29>;
ptp-timer = <&ptp_timer0>; ptp-timer = <&ptp_timer0>;
pcsphy-handle = <&pcsphy1>; pcsphy-handle = <&pcsphy1>, <&qsgmiia_pcs1>;
pcs-handle-names = "sgmii", "qsgmii";
};
mdio@e1000 {
qsgmiia_pcs1: ethernet-pcs@1 {
compatible = "fsl,lynx-pcs";
reg = <1>;
};
}; };
mdio@e3000 { mdio@e3000 {
......
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-2.dtsi
View file @ 4e31b808
...@@ -51,7 +51,15 @@ ethernet@e4000 { ...@@ -51,7 +51,15 @@ ethernet@e4000 {
reg = <0xe4000 0x1000>; reg = <0xe4000 0x1000>;
fsl,fman-ports = <&fman0_rx_0x0a &fman0_tx_0x2a>; fsl,fman-ports = <&fman0_rx_0x0a &fman0_tx_0x2a>;
ptp-timer = <&ptp_timer0>; ptp-timer = <&ptp_timer0>;
pcsphy-handle = <&pcsphy2>; pcsphy-handle = <&pcsphy2>, <&qsgmiia_pcs2>;
pcs-handle-names = "sgmii", "qsgmii";
};
mdio@e1000 {
qsgmiia_pcs2: ethernet-pcs@2 {
compatible = "fsl,lynx-pcs";
reg = <2>;
};
}; };
mdio@e5000 { mdio@e5000 {
......
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-3.dtsi
View file @ 4e31b808
...@@ -51,7 +51,15 @@ ethernet@e6000 { ...@@ -51,7 +51,15 @@ ethernet@e6000 {
reg = <0xe6000 0x1000>; reg = <0xe6000 0x1000>;
fsl,fman-ports = <&fman0_rx_0x0b &fman0_tx_0x2b>; fsl,fman-ports = <&fman0_rx_0x0b &fman0_tx_0x2b>;
ptp-timer = <&ptp_timer0>; ptp-timer = <&ptp_timer0>;
pcsphy-handle = <&pcsphy3>; pcsphy-handle = <&pcsphy3>, <&qsgmiia_pcs3>;
pcs-handle-names = "sgmii", "qsgmii";
};
mdio@e1000 {
qsgmiia_pcs3: ethernet-pcs@3 {
compatible = "fsl,lynx-pcs";
reg = <3>;
};
}; };
mdio@e7000 { mdio@e7000 {
......
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-4.dtsi
View file @ 4e31b808
...@@ -51,7 +51,8 @@ ethernet@e8000 { ...@@ -51,7 +51,8 @@ ethernet@e8000 {
reg = <0xe8000 0x1000>; reg = <0xe8000 0x1000>;
fsl,fman-ports = <&fman0_rx_0x0c &fman0_tx_0x2c>; fsl,fman-ports = <&fman0_rx_0x0c &fman0_tx_0x2c>;
ptp-timer = <&ptp_timer0>; ptp-timer = <&ptp_timer0>;
pcsphy-handle = <&pcsphy4>; pcsphy-handle = <&pcsphy4>, <&pcsphy4>;
pcs-handle-names = "sgmii", "qsgmii";
}; };
mdio@e9000 { mdio@e9000 {
......
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-5.dtsi
View file @ 4e31b808
...@@ -51,7 +51,15 @@ ethernet@ea000 { ...@@ -51,7 +51,15 @@ ethernet@ea000 {
reg = <0xea000 0x1000>; reg = <0xea000 0x1000>;
fsl,fman-ports = <&fman0_rx_0x0d &fman0_tx_0x2d>; fsl,fman-ports = <&fman0_rx_0x0d &fman0_tx_0x2d>;
ptp-timer = <&ptp_timer0>; ptp-timer = <&ptp_timer0>;
pcsphy-handle = <&pcsphy5>; pcsphy-handle = <&pcsphy5>, <&qsgmiib_pcs1>;
pcs-handle-names = "sgmii", "qsgmii";
};
mdio@e9000 {
qsgmiib_pcs1: ethernet-pcs@1 {
compatible = "fsl,lynx-pcs";
reg = <1>;
};
}; };
mdio@eb000 { mdio@eb000 {
......
arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-0.dtsi
View file @ 4e31b808
...@@ -52,7 +52,15 @@ ethernet@f0000 { ...@@ -52,7 +52,15 @@ ethernet@f0000 {
compatible = "fsl,fman-memac"; compatible = "fsl,fman-memac";
reg = <0xf0000 0x1000>; reg = <0xf0000 0x1000>;
fsl,fman-ports = <&fman1_rx_0x10 &fman1_tx_0x30>; fsl,fman-ports = <&fman1_rx_0x10 &fman1_tx_0x30>;
pcsphy-handle = <&pcsphy14>; pcsphy-handle = <&pcsphy14>, <&qsgmiid_pcs2>, <&pcsphy14>;
pcs-handle-names = "sgmii", "qsgmii", "xfi";
};
mdio@e9000 {
qsgmiid_pcs2: ethernet-pcs@2 {
compatible = "fsl,lynx-pcs";
reg = <2>;
};
}; };
mdio@f1000 { mdio@f1000 {
......
arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-1.dtsi
View file @ 4e31b808
...@@ -52,7 +52,15 @@ ethernet@f2000 { ...@@ -52,7 +52,15 @@ ethernet@f2000 {
compatible = "fsl,fman-memac"; compatible = "fsl,fman-memac";
reg = <0xf2000 0x1000>; reg = <0xf2000 0x1000>;
fsl,fman-ports = <&fman1_rx_0x11 &fman1_tx_0x31>; fsl,fman-ports = <&fman1_rx_0x11 &fman1_tx_0x31>;
pcsphy-handle = <&pcsphy15>; pcsphy-handle = <&pcsphy15>, <&qsgmiid_pcs3>, <&pcsphy15>;
pcs-handle-names = "sgmii", "qsgmii", "xfi";
};
mdio@e9000 {
qsgmiid_pcs3: ethernet-pcs@3 {
compatible = "fsl,lynx-pcs";
reg = <3>;
};
}; };
mdio@f3000 { mdio@f3000 {
......
arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-0.dtsi
View file @ 4e31b808
...@@ -51,7 +51,8 @@ ethernet@e0000 { ...@@ -51,7 +51,8 @@ ethernet@e0000 {
reg = <0xe0000 0x1000>; reg = <0xe0000 0x1000>;
fsl,fman-ports = <&fman1_rx_0x08 &fman1_tx_0x28>; fsl,fman-ports = <&fman1_rx_0x08 &fman1_tx_0x28>;
ptp-timer = <&ptp_timer1>; ptp-timer = <&ptp_timer1>;
pcsphy-handle = <&pcsphy8>; pcsphy-handle = <&pcsphy8>, <&pcsphy8>;
pcs-handle-names = "sgmii", "qsgmii";
}; };
mdio@e1000 { mdio@e1000 {
......
arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-1.dtsi
View file @ 4e31b808
...@@ -51,7 +51,15 @@ ethernet@e2000 { ...@@ -51,7 +51,15 @@ ethernet@e2000 {
reg = <0xe2000 0x1000>; reg = <0xe2000 0x1000>;
fsl,fman-ports = <&fman1_rx_0x09 &fman1_tx_0x29>; fsl,fman-ports = <&fman1_rx_0x09 &fman1_tx_0x29>;
ptp-timer = <&ptp_timer1>; ptp-timer = <&ptp_timer1>;
pcsphy-handle = <&pcsphy9>; pcsphy-handle = <&pcsphy9>, <&qsgmiic_pcs1>;
pcs-handle-names = "sgmii", "qsgmii";
};
mdio@e1000 {
qsgmiic_pcs1: ethernet-pcs@1 {
compatible = "fsl,lynx-pcs";
reg = <1>;
};
}; };
mdio@e3000 { mdio@e3000 {
......
arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-2.dtsi
View file @ 4e31b808
...@@ -51,7 +51,15 @@ ethernet@e4000 { ...@@ -51,7 +51,15 @@ ethernet@e4000 {
reg = <0xe4000 0x1000>; reg = <0xe4000 0x1000>;
fsl,fman-ports = <&fman1_rx_0x0a &fman1_tx_0x2a>; fsl,fman-ports = <&fman1_rx_0x0a &fman1_tx_0x2a>;
ptp-timer = <&ptp_timer1>; ptp-timer = <&ptp_timer1>;
pcsphy-handle = <&pcsphy10>; pcsphy-handle = <&pcsphy10>, <&qsgmiic_pcs2>;
pcs-handle-names = "sgmii", "qsgmii";
};
mdio@e1000 {
qsgmiic_pcs2: ethernet-pcs@2 {
compatible = "fsl,lynx-pcs";
reg = <2>;
};
}; };
mdio@e5000 { mdio@e5000 {
......
arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-3.dtsi
View file @ 4e31b808
...@@ -51,7 +51,15 @@ ethernet@e6000 { ...@@ -51,7 +51,15 @@ ethernet@e6000 {
reg = <0xe6000 0x1000>; reg = <0xe6000 0x1000>;
fsl,fman-ports = <&fman1_rx_0x0b &fman1_tx_0x2b>; fsl,fman-ports = <&fman1_rx_0x0b &fman1_tx_0x2b>;
ptp-timer = <&ptp_timer1>; ptp-timer = <&ptp_timer1>;
pcsphy-handle = <&pcsphy11>; pcsphy-handle = <&pcsphy11>, <&qsgmiic_pcs3>;
pcs-handle-names = "sgmii", "qsgmii";
};
mdio@e1000 {
qsgmiic_pcs3: ethernet-pcs@3 {
compatible = "fsl,lynx-pcs";
reg = <3>;
};
}; };
mdio@e7000 { mdio@e7000 {
......
arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-4.dtsi
View file @ 4e31b808
...@@ -51,7 +51,8 @@ ethernet@e8000 { ...@@ -51,7 +51,8 @@ ethernet@e8000 {
reg = <0xe8000 0x1000>; reg = <0xe8000 0x1000>;
fsl,fman-ports = <&fman1_rx_0x0c &fman1_tx_0x2c>; fsl,fman-ports = <&fman1_rx_0x0c &fman1_tx_0x2c>;
ptp-timer = <&ptp_timer1>; ptp-timer = <&ptp_timer1>;
pcsphy-handle = <&pcsphy12>; pcsphy-handle = <&pcsphy12>, <&pcsphy12>;
pcs-handle-names = "sgmii", "qsgmii";
}; };
mdio@e9000 { mdio@e9000 {
......
arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-5.dtsi
View file @ 4e31b808
...@@ -51,7 +51,15 @@ ethernet@ea000 { ...@@ -51,7 +51,15 @@ ethernet@ea000 {
reg = <0xea000 0x1000>; reg = <0xea000 0x1000>;
fsl,fman-ports = <&fman1_rx_0x0d &fman1_tx_0x2d>; fsl,fman-ports = <&fman1_rx_0x0d &fman1_tx_0x2d>;
ptp-timer = <&ptp_timer1>; ptp-timer = <&ptp_timer1>;
pcsphy-handle = <&pcsphy13>; pcsphy-handle = <&pcsphy13>, <&qsgmiid_pcs1>;
pcs-handle-names = "sgmii", "qsgmii";
};
mdio@e9000 {
qsgmiid_pcs1: ethernet-pcs@1 {
compatible = "fsl,lynx-pcs";
reg = <1>;
};
}; };
mdio@eb000 { mdio@eb000 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7