Skip to content

Commit 1d641bd

Browse files
davem330davem330
committed
Merge branch 'mvneta-phylink'
Russell King says: ==================== Convert mvneta to phylink This series converts mvneta to use phylink, which is necessary to support the SFP cages on SolidRun's Clearfog platform. This series just converts mvneta without adding the DT parts - having discussed with Andrew, we believe we're too close to the merge window to submit that patch. I've split the "net: mvneta: convert to phylink" patch up to make it easier to review, and in doing so, spotted some minor corner cases that needed to be fixed along the way. This series depends on the previously merged phylink patches in netdev, along with the recently reviewed 7 patch series "Resolve races in phy accessors" without which, the race described in patch 5 of that series is very evident when triggering a dummy hibernate cycle. This series also illustrates how to convert mvpp2 to phylink. mvneta is the only user of the fixed_phy_update_state() API, and this becomes redundant with the conversion. It would be good to get this series not only reviewed, but also independently tested to ensure that I haven't missed anything - I only have the Clearfog platform to test on, and that doesn't support all the different interface modes that mvneta supports. A particularly interesting side effect of this series is that DSA switches no longer need the "CPU" port and DSA facing MAC ethernet instance to be marked as a fixed link anymore with mvneta - we can use 1000BaseX mode, and the DSA to CPU link will use the 802.3z negotiation to determine the link properties without needing the link parameters to be explicitly stated in DT - that is a subject of a future patch. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2 parents d033a23 + d2b9779 commit 1d641bd

File tree

4 files changed

+405
-324
lines changed

4 files changed

+405
-324
lines changed

‎drivers/net/ethernet/marvell/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ config MVNETA
6060
depends on ARCH_MVEBU || COMPILE_TEST
6161
depends on HAS_DMA
6262
select MVMDIO
63-
select FIXED_PHY
63+
select PHYLINK
6464
---help---
6565
This driver supports the network interface units in the
6666
Marvell ARMADA XP, ARMADA 370, ARMADA 38x and

0 commit comments

Comments
 (0)