2f663cab46
Replace patches for MediaTek Ethernet driver SGMII/SerDes unit with their corresponding upstream patches. Not all of the patches in our tree went upstream as-is, some are slightly different implementations, and they require the phylink_pcs helpers now made available. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
From 6f38fffe2179dd29612aea2c67c46ed6682b4e46 Mon Sep 17 00:00:00 2001
|
|
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
|
|
Date: Thu, 27 Oct 2022 14:11:08 +0100
|
|
Subject: [PATCH 06/10] net: mtk_eth_soc: move PHY power up
|
|
|
|
The PHY power up is common to both configuration paths, so move it into
|
|
the parent function. We need to do this for all serdes modes.
|
|
|
|
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/mediatek/mtk_sgmii.c | 11 ++++-------
|
|
1 file changed, 4 insertions(+), 7 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_sgmii.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_sgmii.c
|
|
@@ -45,9 +45,6 @@ static void mtk_pcs_setup_mode_an(struct
|
|
|
|
regmap_update_bits(mpcs->regmap, SGMSYS_PCS_CONTROL_1,
|
|
SGMII_AN_RESTART, SGMII_AN_RESTART);
|
|
-
|
|
- regmap_update_bits(mpcs->regmap, SGMSYS_QPHY_PWR_STATE_CTRL,
|
|
- SGMII_PHYA_PWD, 0);
|
|
}
|
|
|
|
/* For 1000BASE-X and 2500BASE-X interface modes, which operate at a
|
|
@@ -72,10 +69,6 @@ static void mtk_pcs_setup_mode_force(str
|
|
regmap_update_bits(mpcs->regmap, SGMSYS_SGMII_MODE,
|
|
SGMII_IF_MODE_MASK & ~SGMII_DUPLEX_FULL,
|
|
SGMII_SPEED_1000);
|
|
-
|
|
- /* Release PHYA power down state */
|
|
- regmap_update_bits(mpcs->regmap, SGMSYS_QPHY_PWR_STATE_CTRL,
|
|
- SGMII_PHYA_PWD, 0);
|
|
}
|
|
|
|
static int mtk_pcs_config(struct phylink_pcs *pcs, unsigned int mode,
|
|
@@ -91,6 +84,10 @@ static int mtk_pcs_config(struct phylink
|
|
else if (phylink_autoneg_inband(mode))
|
|
mtk_pcs_setup_mode_an(mpcs);
|
|
|
|
+ /* Release PHYA power down state */
|
|
+ regmap_update_bits(mpcs->regmap, SGMSYS_QPHY_PWR_STATE_CTRL,
|
|
+ SGMII_PHYA_PWD, 0);
|
|
+
|
|
return 0;
|
|
}
|
|
|