43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
From 71d927494463c4f016d828e1134da26b7e961af5 Mon Sep 17 00:00:00 2001
|
|
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
|
|
Date: Tue, 16 Nov 2021 10:06:53 +0000
|
|
Subject: [PATCH] net: mtk_eth_soc: drop use of phylink_helper_basex_speed()
|
|
|
|
Now that we have a better method to select SFP interface modes, we
|
|
no longer need to use phylink_helper_basex_speed() in a driver's
|
|
validation function, and we can also get rid of our hack to indicate
|
|
both 1000base-X and 2500base-X if the comphy is present to make that
|
|
work. Remove this hack and use of phylink_helper_basex_speed().
|
|
|
|
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 8 ++------
|
|
1 file changed, 2 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -587,8 +587,9 @@ static void mtk_validate(struct phylink_
|
|
phylink_set(mask, 1000baseT_Full);
|
|
break;
|
|
case PHY_INTERFACE_MODE_1000BASEX:
|
|
- case PHY_INTERFACE_MODE_2500BASEX:
|
|
phylink_set(mask, 1000baseX_Full);
|
|
+ break;
|
|
+ case PHY_INTERFACE_MODE_2500BASEX:
|
|
phylink_set(mask, 2500baseX_Full);
|
|
break;
|
|
case PHY_INTERFACE_MODE_GMII:
|
|
@@ -618,11 +619,6 @@ static void mtk_validate(struct phylink_
|
|
|
|
linkmode_and(supported, supported, mask);
|
|
linkmode_and(state->advertising, state->advertising, mask);
|
|
-
|
|
- /* We can only operate at 2500BaseX or 1000BaseX. If requested
|
|
- * to advertise both, only report advertising at 2500BaseX.
|
|
- */
|
|
- phylink_helper_basex_speed(state);
|
|
}
|
|
|
|
static const struct phylink_mac_ops mtk_phylink_ops = {
|