Commit 71d92749 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by David S. Miller
Browse files

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: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent db81ca15

drivers/net/ethernet/mediatek/mtk_eth_soc.c

+2 −6
Original line number Diff line number Diff line
@@ -477,8 +477,9 @@ static void mtk_validate(struct phylink_config *config, 
		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:
@@ -508,11 +509,6 @@ static void mtk_validate(struct phylink_config *config, 


	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 = {