net: mtk_eth_soc: move interface speed selection

Move the selection of the underlying interface speed to the pcs_config
function, so we always program the interface speed.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/mediatek/mtk_sgmii.c b/drivers/net/ethernet/mediatek/mtk_sgmii.c
index 63b2557..c590d58 100644 (file)
--- a/drivers/net/ethernet/mediatek/mtk_sgmii.c
+++ b/drivers/net/ethernet/mediatek/mtk_sgmii.c
@@ -53,14 +53,6 @@ static void mtk_pcs_setup_mode_an(struct mtk_pcs *mpcs)
 static void mtk_pcs_setup_mode_force(struct mtk_pcs *mpcs,
                                     phy_interface_t interface)
 {
-       unsigned int rgc3;
-
-       if (interface == PHY_INTERFACE_MODE_2500BASEX)
-               rgc3 = RG_PHY_SPEED_3_125G;
-
-       regmap_update_bits(mpcs->regmap, mpcs->ana_rgc3,
-                          RG_PHY_SPEED_3_125G, rgc3);
-
        /* Disable SGMII AN */
        regmap_update_bits(mpcs->regmap, SGMSYS_PCS_CONTROL_1,
                           SGMII_AN_ENABLE, 0);
@@ -77,6 +69,16 @@ static int mtk_pcs_config(struct phylink_pcs *pcs, unsigned int mode,
                          bool permit_pause_to_mac)
 {
        struct mtk_pcs *mpcs = pcs_to_mtk_pcs(pcs);
+       unsigned int rgc3;
+
+       if (interface == PHY_INTERFACE_MODE_2500BASEX)
+               rgc3 = RG_PHY_SPEED_3_125G;
+       else
+               rgc3 = 0;
+
+       /* Configure the underlying interface speed */
+       regmap_update_bits(mpcs->regmap, mpcs->ana_rgc3,
+                          RG_PHY_SPEED_3_125G, rgc3);
 
        /* Setup SGMIISYS with the determined property */
        if (interface != PHY_INTERFACE_MODE_SGMII)