git.openwrt.org Git - openwrt/staging/neocturne.git/blob

   1 From 71d927494463c4f016d828e1134da26b7e961af5 Mon Sep 17 00:00:00 2001
   2 From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
   3 Date: Tue, 16 Nov 2021 10:06:53 +0000
   4 Subject: [PATCH] net: mtk_eth_soc: drop use of phylink_helper_basex_speed()
   5
   6 Now that we have a better method to select SFP interface modes, we
   7 no longer need to use phylink_helper_basex_speed() in a driver's
   8 validation function, and we can also get rid of our hack to indicate
   9 both 1000base-X and 2500base-X if the comphy is present to make that
  10 work. Remove this hack and use of phylink_helper_basex_speed().
  11
  12 Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
  13 Signed-off-by: David S. Miller <davem@davemloft.net>
  14 ---
  15  drivers/net/ethernet/mediatek/mtk_eth_soc.c | 8 ++------
  16  1 file changed, 2 insertions(+), 6 deletions(-)
  17
  18 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
  19 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
  20 @@ -577,8 +577,9 @@ static void mtk_validate(struct phylink_
  21                 phylink_set(mask, 1000baseT_Full);
  22                 break;
  23         case PHY_INTERFACE_MODE_1000BASEX:
  24 -       case PHY_INTERFACE_MODE_2500BASEX:
  25                 phylink_set(mask, 1000baseX_Full);
  26 +               break;
  27 +       case PHY_INTERFACE_MODE_2500BASEX:
  28                 phylink_set(mask, 2500baseX_Full);
  29                 break;
  30         case PHY_INTERFACE_MODE_GMII:
  31 @@ -608,11 +609,6 @@ static void mtk_validate(struct phylink_
  32
  33         linkmode_and(supported, supported, mask);
  34         linkmode_and(state->advertising, state->advertising, mask);
  35 -
  36 -       /* We can only operate at 2500BaseX or 1000BaseX. If requested
  37 -        * to advertise both, only report advertising at 2500BaseX.
  38 -        */
  39 -       phylink_helper_basex_speed(state);
  40  }
  41
  42  static const struct phylink_mac_ops mtk_phylink_ops = {