[PATCH net-next 4/8] net: stmmac: move common defines in stmmac_ptp.h

From: alexis . lothore
Date: Fri Jun 16 2023 - 06:05:57 EST


From: Alexis Lothoré <alexis.lothore@xxxxxxxxxxx>

Even if the address of registers containing statuses is not the same
between dwamc4 and dwmac 1000, the offsets of interest inside those
register are the same regarding auxiliary snapshots. As a consequence, move
those offset definitions in stmmac_ptp.h

Signed-off-by: Alexis Lothoré <alexis.lothore@xxxxxxxxxxx>
---
drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 5 -----
drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h | 4 +++-
2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4.h b/drivers/net/ethernet/stmicro/stmmac/dwmac4.h
index 9e7ba5f2e53a..32a15c020a43 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4.h
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4.h
@@ -313,11 +313,6 @@ enum power_event {
#define GMAC_L4DP0_SHIFT 16
#define GMAC_L4SP0 GENMASK(15, 0)

-/* MAC Timestamp Status */
-#define GMAC_TIMESTAMP_AUXTSTRIG BIT(2)
-#define GMAC_TIMESTAMP_ATSNS_MASK GENMASK(29, 25)
-#define GMAC_TIMESTAMP_ATSNS_SHIFT 25
-
/* MTL registers */
#define MTL_OPERATION_MODE 0x00000c00
#define MTL_FRPE BIT(15)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h
index 92ed421702b9..04bbf12dfd4b 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h
@@ -64,6 +64,8 @@
#define PTP_SSIR_SSINC_MAX 0xff
#define GMAC4_PTP_SSIR_SSINC_SHIFT 16

-
+/* MAC Timestamp Status */
+#define GMAC_TIMESTAMP_ATSNS_MASK GENMASK(29, 25)
+#define GMAC_TIMESTAMP_ATSNS_SHIFT 25

#endif /* __STMMAC_PTP_H__ */
--
2.41.0