From b625cdcd68479b3d540a915785b6d9809b52a2f8 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Tue, 14 Feb 2023 06:37:54 +0000
Subject: [PATCH] stmmac read mac form eeprom
---
kernel/drivers/net/ethernet/stmicro/stmmac/hwif.c | 30 ++----------------------------
1 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/kernel/drivers/net/ethernet/stmicro/stmmac/hwif.c b/kernel/drivers/net/ethernet/stmicro/stmmac/hwif.c
index c6b88cd..357309a 100644
--- a/kernel/drivers/net/ethernet/stmicro/stmmac/hwif.c
+++ b/kernel/drivers/net/ethernet/stmicro/stmmac/hwif.c
@@ -23,7 +23,6 @@
return reg & GENMASK(7, 0);
}
-#ifdef CONFIG_STMMAC_FULL
static void stmmac_dwmac_mode_quirk(struct stmmac_priv *priv)
{
struct mac_device_info *mac = priv->hw;
@@ -69,7 +68,6 @@
stmmac_dwmac_mode_quirk(priv);
return 0;
}
-#endif
static const struct stmmac_hwif_entry {
bool gmac;
@@ -80,16 +78,13 @@
const void *desc;
const void *dma;
const void *mac;
-#ifdef CONFIG_STMMAC_PTP
const void *hwtimestamp;
-#endif
const void *mode;
const void *tc;
int (*setup)(struct stmmac_priv *priv);
int (*quirks)(struct stmmac_priv *priv);
} stmmac_hw[] = {
/* NOTE: New HW versions shall go to the end of this table */
-#ifdef CONFIG_STMMAC_FULL
{
.gmac = false,
.gmac4 = false,
@@ -102,9 +97,7 @@
.desc = NULL,
.dma = &dwmac100_dma_ops,
.mac = &dwmac100_ops,
-#ifdef CONFIG_STMMAC_PTP
.hwtimestamp = &stmmac_ptp,
-#endif
.mode = NULL,
.tc = NULL,
.setup = dwmac100_setup,
@@ -121,9 +114,7 @@
.desc = NULL,
.dma = &dwmac1000_dma_ops,
.mac = &dwmac1000_ops,
-#ifdef CONFIG_STMMAC_PTP
.hwtimestamp = &stmmac_ptp,
-#endif
.mode = NULL,
.tc = NULL,
.setup = dwmac1000_setup,
@@ -140,9 +131,7 @@
.desc = &dwmac4_desc_ops,
.dma = &dwmac4_dma_ops,
.mac = &dwmac4_ops,
-#ifdef CONFIG_STMMAC_PTP
.hwtimestamp = &stmmac_ptp,
-#endif
.mode = NULL,
.tc = NULL,
.setup = dwmac4_setup,
@@ -159,16 +148,12 @@
.desc = &dwmac4_desc_ops,
.dma = &dwmac4_dma_ops,
.mac = &dwmac410_ops,
-#ifdef CONFIG_STMMAC_PTP
.hwtimestamp = &stmmac_ptp,
-#endif
.mode = &dwmac4_ring_mode_ops,
.tc = NULL,
.setup = dwmac4_setup,
.quirks = NULL,
- },
-#endif /* CONFIG_STMMAC_FULL */
- {
+ }, {
.gmac = false,
.gmac4 = true,
.xgmac = false,
@@ -180,16 +165,12 @@
.desc = &dwmac4_desc_ops,
.dma = &dwmac410_dma_ops,
.mac = &dwmac410_ops,
-#ifdef CONFIG_STMMAC_PTP
.hwtimestamp = &stmmac_ptp,
-#endif
.mode = &dwmac4_ring_mode_ops,
.tc = NULL,
.setup = dwmac4_setup,
.quirks = NULL,
- },
-#ifdef CONFIG_STMMAC_FULL
- {
+ }, {
.gmac = false,
.gmac4 = true,
.xgmac = false,
@@ -201,9 +182,7 @@
.desc = &dwmac4_desc_ops,
.dma = &dwmac410_dma_ops,
.mac = &dwmac510_ops,
-#ifdef CONFIG_STMMAC_PTP
.hwtimestamp = &stmmac_ptp,
-#endif
.mode = &dwmac4_ring_mode_ops,
.tc = &dwmac510_tc_ops,
.setup = dwmac4_setup,
@@ -220,15 +199,12 @@
.desc = &dwxgmac210_desc_ops,
.dma = &dwxgmac210_dma_ops,
.mac = &dwxgmac210_ops,
-#ifdef CONFIG_STMMAC_PTP
.hwtimestamp = &stmmac_ptp,
-#endif
.mode = NULL,
.tc = NULL,
.setup = dwxgmac2_setup,
.quirks = NULL,
},
-#endif
};
int stmmac_hwif_init(struct stmmac_priv *priv)
@@ -288,9 +264,7 @@
mac->desc = mac->desc ? : entry->desc;
mac->dma = mac->dma ? : entry->dma;
mac->mac = mac->mac ? : entry->mac;
-#ifdef CONFIG_STMMAC_PTP
mac->ptp = mac->ptp ? : entry->hwtimestamp;
-#endif
mac->mode = mac->mode ? : entry->mode;
mac->tc = mac->tc ? : entry->tc;
--
Gitblit v1.6.2