Skip to content

Commit 14cac66

Browse files
Alain Volmatkuba-moo
authored andcommitted
net: ethernet: stmmac: dwmac-sti: remove stih415/stih416/stid127
Remove no more supported platforms (stih415/stih416 and stid127) Signed-off-by: Alain Volmat <[email protected]> Acked-by: Jakub Kicinski <[email protected]> Reviewed-by: Horatiu Vultur <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 33d74c8 commit 14cac66

File tree

1 file changed

+1
-59
lines changed

1 file changed

+1
-59
lines changed

drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c

Lines changed: 1 addition & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#define IS_PHY_IF_MODE_GBIT(iface) (IS_PHY_IF_MODE_RGMII(iface) || \
3636
iface == PHY_INTERFACE_MODE_GMII)
3737

38-
/* STiH4xx register definitions (STiH415/STiH416/STiH407/STiH410 families)
38+
/* STiH4xx register definitions (STiH407/STiH410 families)
3939
*
4040
* Below table summarizes the clock requirement and clock sources for
4141
* supported phy interface modes with link speeds.
@@ -75,27 +75,6 @@
7575
#define STIH4XX_ETH_SEL_INTERNAL_NOTEXT_PHYCLK BIT(7)
7676
#define STIH4XX_ETH_SEL_TXCLK_NOT_CLK125 BIT(6)
7777

78-
/* STiD127 register definitions
79-
*-----------------------
80-
* src |BIT(6)| BIT(7)|
81-
*-----------------------
82-
* MII | 1 | n/a |
83-
*-----------------------
84-
* RMII | n/a | 1 |
85-
* clkgen| | |
86-
*-----------------------
87-
* RMII | n/a | 0 |
88-
* phyclk| | |
89-
*-----------------------
90-
* RGMII | 1 | n/a |
91-
* clkgen| | |
92-
*-----------------------
93-
*/
94-
95-
#define STID127_RETIME_SRC_MASK GENMASK(7, 6)
96-
#define STID127_ETH_SEL_INTERNAL_NOTEXT_PHYCLK BIT(7)
97-
#define STID127_ETH_SEL_INTERNAL_NOTEXT_TXCLK BIT(6)
98-
9978
#define ENMII_MASK GENMASK(5, 5)
10079
#define ENMII BIT(5)
10180
#define EN_MASK GENMASK(1, 1)
@@ -194,36 +173,6 @@ static void stih4xx_fix_retime_src(void *priv, u32 spd)
194173
stih4xx_tx_retime_val[src]);
195174
}
196175

197-
static void stid127_fix_retime_src(void *priv, u32 spd)
198-
{
199-
struct sti_dwmac *dwmac = priv;
200-
u32 reg = dwmac->ctrl_reg;
201-
u32 freq = 0;
202-
u32 val = 0;
203-
204-
if (dwmac->interface == PHY_INTERFACE_MODE_MII) {
205-
val = STID127_ETH_SEL_INTERNAL_NOTEXT_TXCLK;
206-
} else if (dwmac->interface == PHY_INTERFACE_MODE_RMII) {
207-
if (!dwmac->ext_phyclk) {
208-
val = STID127_ETH_SEL_INTERNAL_NOTEXT_PHYCLK;
209-
freq = DWMAC_50MHZ;
210-
}
211-
} else if (IS_PHY_IF_MODE_RGMII(dwmac->interface)) {
212-
val = STID127_ETH_SEL_INTERNAL_NOTEXT_TXCLK;
213-
if (spd == SPEED_1000)
214-
freq = DWMAC_125MHZ;
215-
else if (spd == SPEED_100)
216-
freq = DWMAC_25MHZ;
217-
else if (spd == SPEED_10)
218-
freq = DWMAC_2_5MHZ;
219-
}
220-
221-
if (freq)
222-
clk_set_rate(dwmac->clk, freq);
223-
224-
regmap_update_bits(dwmac->regmap, reg, STID127_RETIME_SRC_MASK, val);
225-
}
226-
227176
static int sti_dwmac_set_mode(struct sti_dwmac *dwmac)
228177
{
229178
struct regmap *regmap = dwmac->regmap;
@@ -408,14 +357,7 @@ static const struct sti_dwmac_of_data stih4xx_dwmac_data = {
408357
.fix_retime_src = stih4xx_fix_retime_src,
409358
};
410359

411-
static const struct sti_dwmac_of_data stid127_dwmac_data = {
412-
.fix_retime_src = stid127_fix_retime_src,
413-
};
414-
415360
static const struct of_device_id sti_dwmac_match[] = {
416-
{ .compatible = "st,stih415-dwmac", .data = &stih4xx_dwmac_data},
417-
{ .compatible = "st,stih416-dwmac", .data = &stih4xx_dwmac_data},
418-
{ .compatible = "st,stid127-dwmac", .data = &stid127_dwmac_data},
419361
{ .compatible = "st,stih407-dwmac", .data = &stih4xx_dwmac_data},
420362
{ }
421363
};

0 commit comments

Comments
 (0)