net: ethernet: stmmac: dwmac-sti: remove stih415/stih416/stid127
Subsystems (4)
PATCH 1/1 net: ethernet: stmmac: dwmac-sti: remove stih415/stih416/stid127
Remove no more supported platforms (stih415/stih416 and stid127)
---
Patch sent previously as part of serie: https://lore.kernel.org/all/[email protected]/
.../net/ethernet/stmicro/stmmac/dwmac-sti.c | 60 +------------------ 1 file changed, 1 insertion(+), 59 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c +1 -59
@@ -35,7 +35,7 @@#define IS_PHY_IF_MODE_GBIT (iface) (IS_PHY_IF_MODE_RGMII(iface) || \ iface == PHY_INTERFACE_MODE_GMII) -/* STiH4xx register definitions (STiH415/STiH416/STiH407/STiH410 families) +/* STiH4xx register definitions (STiH407/STiH410 families) * * Below table summarizes the clock requirement and clock sources for * supported phy interface modes with link speeds.
@@ -75,27 +75,6 @@#define STIH4XX_ETH_SEL_INTERNAL_NOTEXT_PHYCLK BIT(7)#define STIH4XX_ETH_SEL_TXCLK_NOT_CLK125 BIT(6) -/* STiD127 register definitions -*----------------------- -* src |BIT(6)| BIT(7)| -*----------------------- -* MII | 1 | n/a | -*----------------------- -* RMII | n/a | 1 | -* clkgen| | | -*----------------------- -* RMII | n/a | 0 | -* phyclk| | | -*----------------------- -* RGMII | 1 | n/a | -* clkgen| | | -*----------------------- -*/ - -#define STID127_RETIME_SRC_MASK GENMASK(7, 6) -#define STID127_ETH_SEL_INTERNAL_NOTEXT_PHYCLK BIT(7) -#define STID127_ETH_SEL_INTERNAL_NOTEXT_TXCLK BIT(6) -#define ENMII_MASK GENMASK(5, 5)#define ENMII BIT(5)#define EN_MASK GENMASK(1, 1)
@@ -194,36 +173,6 @@ static void stih4xx_fix_retime_src(void *priv, u32 spd) stih4xx_tx_retime_val[src]); } -static void stid127_fix_retime_src (void *priv,u32 spd) -{ -struct sti_dwmac *dwmac = priv; -u32 reg = dwmac->ctrl_reg; -u32 freq =0 ; -u32 val =0 ; - -if (dwmac->interface ==PHY_INTERFACE_MODE_MII ) { - val =STID127_ETH_SEL_INTERNAL_NOTEXT_TXCLK ; - }else if (dwmac->interface ==PHY_INTERFACE_MODE_RMII ) { -if (!dwmac->ext_phyclk) { - val =STID127_ETH_SEL_INTERNAL_NOTEXT_PHYCLK ; - freq =DWMAC_50MHZ ; - } - }else if (IS_PHY_IF_MODE_RGMII (dwmac->interface)) { - val =STID127_ETH_SEL_INTERNAL_NOTEXT_TXCLK ; -if (spd ==SPEED_1000 ) - freq =DWMAC_125MHZ ; -else if (spd ==SPEED_100 ) - freq =DWMAC_25MHZ ; -else if (spd ==SPEED_10 ) - freq =DWMAC_2_5MHZ ; - } - -if (freq) -clk_set_rate (dwmac->clk, freq); - -regmap_update_bits (dwmac->regmap, reg,STID127_RETIME_SRC_MASK , val); -} -static int sti_dwmac_set_mode (struct sti_dwmac *dwmac) {struct regmap *regmap = dwmac->regmap;
@@ -408,14 +357,7 @@ static const struct sti_dwmac_of_data stih4xx_dwmac_data = { .fix_retime_src = stih4xx_fix_retime_src, }; -static const struct sti_dwmac_of_data stid127_dwmac_data = { - .fix_retime_src = stid127_fix_retime_src, -}; -static const struct of_device_id sti_dwmac_match[] = { - { .compatible ="st,stih415-dwmac" , .data = &stih4xx_dwmac_data}, - { .compatible ="st,stih416-dwmac" , .data = &stih4xx_dwmac_data}, - { .compatible ="st,stid127-dwmac" , .data = &stid127_dwmac_data}, { .compatible ="st,stih407-dwmac" , .data = &stih4xx_dwmac_data}, { } };
Signature · 1 line
2.34.1
Quoted 2 lines · Alain Volmat
Remove no more supported platforms (stih415/stih416 and stid127)
Quoted 105 lines
Signed-off-by Alain Volmat <[email protected]>Acked-by Jakub Kicinski <[email protected]>---
Patch sent previously as part of serie: https://lore.kernel.org/all/[email protected]/.../net/ethernet/stmicro/stmmac/dwmac-sti.c | 60 +------------------ 1 file changed, 1 insertion(+), 59 deletions(-)drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c +1
-60@@ -35,7 +35,7 @@#define IS_PHY_IF_MODE_GBIT (iface) (IS_PHY_IF_MODE_RGMII(iface) || \ iface == PHY_INTERFACE_MODE_GMII) -/* STiH4xx register definitions (STiH415/STiH416/STiH407/STiH410 families) +/* STiH4xx register definitions (STiH407/STiH410 families) * * Below table summarizes the clock requirement and clock sources for * supported phy interface modes with link speeds. @@ -75,27 +75,6 @@#define STIH4XX_ETH_SEL_INTERNAL_NOTEXT_PHYCLK BIT(7)#define STIH4XX_ETH_SEL_TXCLK_NOT_CLK125 BIT(6) -/* STiD127 register definitions -*----------------------- -* src |BIT(6)| BIT(7)| -*----------------------- -* MII | 1 | n/a | -*----------------------- -* RMII | n/a | 1 | -* clkgen| | | -*----------------------- -* RMII | n/a | 0 | -* phyclk| | | -*----------------------- -* RGMII | 1 | n/a | -* clkgen| | | -*----------------------- -*/ - -#define STID127_RETIME_SRC_MASK GENMASK(7, 6) -#define STID127_ETH_SEL_INTERNAL_NOTEXT_PHYCLK BIT(7) -#define STID127_ETH_SEL_INTERNAL_NOTEXT_TXCLK BIT(6) -#define ENMII_MASK GENMASK(5, 5)#define ENMII BIT(5)#define EN_MASK GENMASK(1, 1)@@ -194,36 +173,6 @@ static void stih4xx_fix_retime_src(void *priv, u32 spd) stih4xx_tx_retime_val[src]); } -static void stid127_fix_retime_src (void *priv,u32 spd) -{ -struct sti_dwmac *dwmac = priv; -u32 reg = dwmac->ctrl_reg; -u32 freq =0 ; -u32 val =0 ; - -if (dwmac->interface ==PHY_INTERFACE_MODE_MII ) { - val =STID127_ETH_SEL_INTERNAL_NOTEXT_TXCLK ; - }else if (dwmac->interface ==PHY_INTERFACE_MODE_RMII ) { -if (!dwmac->ext_phyclk) { - val =STID127_ETH_SEL_INTERNAL_NOTEXT_PHYCLK ; - freq =DWMAC_50MHZ ; - } - }else if (IS_PHY_IF_MODE_RGMII (dwmac->interface)) { - val =STID127_ETH_SEL_INTERNAL_NOTEXT_TXCLK ; -if (spd ==SPEED_1000 ) - freq =DWMAC_125MHZ ; -else if (spd ==SPEED_100 ) - freq =DWMAC_25MHZ ; -else if (spd ==SPEED_10 ) - freq =DWMAC_2_5MHZ ; - } - -if (freq) -clk_set_rate (dwmac->clk, freq); - -regmap_update_bits (dwmac->regmap, reg,STID127_RETIME_SRC_MASK , val); -} -static int sti_dwmac_set_mode (struct sti_dwmac *dwmac) {struct regmap *regmap = dwmac->regmap;@@ -408,14 +357,7 @@ static const struct sti_dwmac_of_data stih4xx_dwmac_data = { .fix_retime_src = stih4xx_fix_retime_src, }; -static const struct sti_dwmac_of_data stid127_dwmac_data = { - .fix_retime_src = stid127_fix_retime_src, -}; -static const struct of_device_id sti_dwmac_match[] = { - { .compatible ="st,stih415-dwmac" , .data = &stih4xx_dwmac_data}, - { .compatible ="st,stih416-dwmac" , .data = &stih4xx_dwmac_data}, - { .compatible ="st,stid127-dwmac" , .data = &stid127_dwmac_data}, { .compatible ="st,stih407-dwmac" , .data = &stih4xx_dwmac_data}, { } }; --2.34.1
Signature · 6 lines
/Horatiu _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Sun, 16 Apr 2023 21:55:23 +0200 you wrote:
Remove no more supported platforms (stih415/stih416 and stid127)
Signed-off-by Alain Volmat <[email protected]>Acked-by Jakub Kicinski <[email protected]>---
Patch sent previously as part of serie: https://lore.kernel.org/all/[email protected]/[...]
Here is the summary with links:
- net: ethernet: stmmac: dwmac-sti: remove stih415/stih416/stid127
https://git.kernel.org/netdev/net-next/c/14cac662235e
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html