| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748 |
- From f752c0df13dfeb721c11d3debb79f08cf437344f Mon Sep 17 00:00:00 2001
- From: "Russell King (Oracle)" <[email protected]>
- Date: Thu, 27 Oct 2022 14:11:13 +0100
- Subject: [PATCH 07/10] 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) <[email protected]>
- Signed-off-by: Jakub Kicinski <[email protected]>
- ---
- drivers/net/ethernet/mediatek/mtk_sgmii.c | 18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
- --- 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
- 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
- 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)
|
