Commit 4ce5a0bd authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: mtk_eth_soc: stop passing phylink state to sgmii setup 



Now that mtk_sgmii_setup_mode_force() only uses the interface mode
from the phylink state, pass just the interface mode into this
function.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent a4591873

drivers/net/ethernet/mediatek/mtk_eth_soc.c

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ static void mtk_mac_config(struct phylink_config *config, unsigned int mode, 
		/* Setup SGMIISYS with the determined property */

		if (state->interface != PHY_INTERFACE_MODE_SGMII)

			err = mtk_sgmii_setup_mode_force(eth->sgmii, sid,

							 state);

							 state->interface);

		else if (phylink_autoneg_inband(mode))

			err = mtk_sgmii_setup_mode_an(eth->sgmii, sid);

drivers/net/ethernet/mediatek/mtk_eth_soc.h

+1 −1
Original line number Diff line number Diff line
@@ -1016,7 +1016,7 @@ int mtk_sgmii_init(struct mtk_sgmii *ss, struct device_node *np, 
		   u32 ana_rgc3);

int mtk_sgmii_setup_mode_an(struct mtk_sgmii *ss, int id);

int mtk_sgmii_setup_mode_force(struct mtk_sgmii *ss, int id,

			       const struct phylink_link_state *state);

			       phy_interface_t interface);

void mtk_sgmii_link_up(struct mtk_sgmii *ss, int id, int speed, int duplex);

void mtk_sgmii_restart_an(struct mtk_eth *eth, int mac_id);

drivers/net/ethernet/mediatek/mtk_sgmii.c

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ int mtk_sgmii_setup_mode_an(struct mtk_sgmii *ss, int id) 
 * fixed speed.

 */

int mtk_sgmii_setup_mode_force(struct mtk_sgmii *ss, int id,

			       const struct phylink_link_state *state)

			       phy_interface_t interface)

{

	unsigned int val;
@@ -74,7 +74,7 @@ int mtk_sgmii_setup_mode_force(struct mtk_sgmii *ss, int id, 


	regmap_read(ss->regmap[id], ss->ana_rgc3, &val);

	val &= ~RG_PHY_SPEED_MASK;

	if (state->interface == PHY_INTERFACE_MODE_2500BASEX)

	if (interface == PHY_INTERFACE_MODE_2500BASEX)

		val |= RG_PHY_SPEED_3_125G;

	regmap_write(ss->regmap[id], ss->ana_rgc3, val);