]> git.ipfire.org Git - thirdparty/linux.git/commit
Merge branch 'net-stmmac-socfpga-1000basex-support-and-cleanups'
authorJakub Kicinski <kuba@kernel.org>
Sat, 26 Apr 2025 02:22:03 +0000 (19:22 -0700)
committerJakub Kicinski <kuba@kernel.org>
Mon, 28 Apr 2025 13:17:46 +0000 (06:17 -0700)
commite527e891492d9e81325967e51a1d21b259318d0e
tree8832284880962744c76d72183636130edc358702
parentf438eee2c8c93320d70cdee7630a06baaa47a304
parent8fb33581bb8a9d27e021723cbccef2936c5ad671
Merge branch 'net-stmmac-socfpga-1000basex-support-and-cleanups'

Maxime Chevallier says:

====================
net: stmmac: socfpga: 1000BaseX support and cleanups

This small series sorts-out 1000BaseX support and does a bit of cleanup
for the Lynx conversion.

Patch 1 makes sure that we set the right phy_mode when working in
1000BaseX mode, so that the internal GMII is configured correctly.

Patch 2 removes a check for phy_device upon calling fix_mac_speed(). As
the SGMII adapter may be chained to a Lynx PCS, checking for a
phy_device to be attached to the netdev before enabling the SGMII
adapter doesn't make sense, as we won't have a downstream PHY when using
1000BaseX.

Patch 3 cleans an unused field from the PCS conversion.

v1: https://lore.kernel.org/20250422094701.49798-1-maxime.chevallier@bootlin.com
v2: https://lore.kernel.org/20250423104646.189648-1-maxime.chevallier@bootlin.com
====================

Link: https://patch.msgid.link/20250424071223.221239-1-maxime.chevallier@bootlin.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>