Message ID | 20230124174757.2956299-1-sean.anderson@seco.com (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
Series | arm64: ls1046ardb: Use in-band-status for SFP module | expand |
Context | Check | Description |
---|---|---|
netdev/tree_selection | success | Not a local patch |
On Tue, 24 Jan 2023 12:47:57 -0500 Sean Anderson wrote: > This should likely go through Shawn Guo's tree, although it could also > go through net-next. It will conflict with [1] which modifies the > adjoining lines and is likely to go through the phy tree. I'm dropping it from networking pw, FWIW.
On Tue, Jan 24, 2023 at 12:47:57PM -0500, Sean Anderson wrote: > net10 is connected to an SFP module. Unfortunately, the I2C lines are > not connected due to an address conflict. Now that DPAA uses phylink, we > can use in-band-status. This lets us determine whether the link is up or > down instead of assuming it is up all the time. Also fix the phy mode > while we're here. > > Signed-off-by: Sean Anderson <sean.anderson@seco.com> Applied, thanks!
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts index 7025aad8ae89..07f6cc6e354a 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts @@ -153,8 +153,8 @@ ethernet@f0000 { /* 10GEC1 */ }; ethernet@f2000 { /* 10GEC2 */ - fixed-link = <0 1 1000 0 0>; - phy-connection-type = "xgmii"; + phy-connection-type = "10gbase-r"; + managed = "in-band-status"; }; mdio@fc000 {
net10 is connected to an SFP module. Unfortunately, the I2C lines are not connected due to an address conflict. Now that DPAA uses phylink, we can use in-band-status. This lets us determine whether the link is up or down instead of assuming it is up all the time. Also fix the phy mode while we're here. Signed-off-by: Sean Anderson <sean.anderson@seco.com> --- This should likely go through Shawn Guo's tree, although it could also go through net-next. It will conflict with [1] which modifies the adjoining lines and is likely to go through the phy tree. [1] https://lore.kernel.org/linux-phy/Y8pLjLWjv0nJa+ww@matsya/T/#m54a5ed1450322df1499836edbb561bc4d6daf4d8 arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)