net: mtk_eth_soc: use phylink_generic_validate()

mtk_eth_soc has no special behaviour in its validation implementation,
so can be switched to phylink_generic_validate().

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 98f9a6e..de4152e 100644 (file)
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -463,56 +463,8 @@ static void mtk_mac_link_up(struct phylink_config *config,
        mtk_w32(mac->hw, mcr, MTK_MAC_MCR(mac->id));
 }
 
-static void mtk_validate(struct phylink_config *config,
-                        unsigned long *supported,
-                        struct phylink_link_state *state)
-{
-       __ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
-
-       phylink_set_port_modes(mask);
-       phylink_set(mask, Autoneg);
-
-       switch (state->interface) {
-       case PHY_INTERFACE_MODE_TRGMII:
-               phylink_set(mask, 1000baseT_Full);
-               break;
-       case PHY_INTERFACE_MODE_1000BASEX:
-               phylink_set(mask, 1000baseX_Full);
-               break;
-       case PHY_INTERFACE_MODE_2500BASEX:
-               phylink_set(mask, 2500baseX_Full);
-               break;
-       case PHY_INTERFACE_MODE_GMII:
-       case PHY_INTERFACE_MODE_RGMII:
-       case PHY_INTERFACE_MODE_RGMII_ID:
-       case PHY_INTERFACE_MODE_RGMII_RXID:
-       case PHY_INTERFACE_MODE_RGMII_TXID:
-               phylink_set(mask, 1000baseT_Half);
-               fallthrough;
-       case PHY_INTERFACE_MODE_SGMII:
-               phylink_set(mask, 1000baseT_Full);
-               phylink_set(mask, 1000baseX_Full);
-               fallthrough;
-       case PHY_INTERFACE_MODE_MII:
-       case PHY_INTERFACE_MODE_RMII:
-       case PHY_INTERFACE_MODE_REVMII:
-       default:
-               phylink_set(mask, 10baseT_Half);
-               phylink_set(mask, 10baseT_Full);
-               phylink_set(mask, 100baseT_Half);
-               phylink_set(mask, 100baseT_Full);
-               break;
-       }
-
-       phylink_set(mask, Pause);
-       phylink_set(mask, Asym_Pause);
-
-       linkmode_and(supported, supported, mask);
-       linkmode_and(state->advertising, state->advertising, mask);
-}
-
 static const struct phylink_mac_ops mtk_phylink_ops = {
-       .validate = mtk_validate,
+       .validate = phylink_generic_validate,
        .mac_pcs_get_state = mtk_mac_pcs_get_state,
        .mac_an_restart = mtk_mac_an_restart,
        .mac_config = mtk_mac_config,
@@ -2971,6 +2923,9 @@ static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
 
        mac->phylink_config.dev = &eth->netdev[id]->dev;
        mac->phylink_config.type = PHYLINK_NETDEV;
+       mac->phylink_config.mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
+               MAC_10 | MAC_100 | MAC_1000 | MAC_2500FD;
+
        __set_bit(PHY_INTERFACE_MODE_MII,
                  mac->phylink_config.supported_interfaces);
        __set_bit(PHY_INTERFACE_MODE_GMII,