[PATCH v4 net-next 6/9] net: stmmac: Add PTP support for XGMAC2

[Jose Abreu]

XGMAC2 uses the same engine of timestamping as GMAC4. Let's use the same
callbacks.

Signed-off-by: Jose Abreu <joab...@synopsys.com>
Cc: David S. Miller <da...@davemloft.net>
Cc: Joao Pinto <jpi...@synopsys.com>
Cc: Giuseppe Cavallaro <peppe.cavall...@st.com>
Cc: Alexandre Torgue <alexandre.tor...@st.com>
---
 drivers/net/ethernet/stmicro/stmmac/hwif.c       | 4 ++--
 drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 6 ++++--
 drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.c 
b/drivers/net/ethernet/stmicro/stmmac/hwif.c
index 4b4ba1c8bad5..357309a6d6a5 100644
--- a/drivers/net/ethernet/stmicro/stmmac/hwif.c
+++ b/drivers/net/ethernet/stmicro/stmmac/hwif.c
@@ -193,13 +193,13 @@ static const struct stmmac_hwif_entry {
                .xgmac = true,
                .min_id = DWXGMAC_CORE_2_10,
                .regs = {
-                       .ptp_off = 0,
+                       .ptp_off = PTP_XGMAC_OFFSET,
                        .mmc_off = 0,
                },
                .desc = &dwxgmac210_desc_ops,
                .dma = &dwxgmac210_dma_ops,
                .mac = &dwxgmac210_ops,
-               .hwtimestamp = NULL,
+               .hwtimestamp = &stmmac_ptp,
                .mode = NULL,
                .tc = NULL,
                .setup = dwxgmac2_setup,
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c 
b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
index 0cb0e39a2be9..2293e21f789f 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
@@ -71,6 +71,9 @@ static int stmmac_adjust_time(struct ptp_clock_info *ptp, s64 
delta)
        u32 sec, nsec;
        u32 quotient, reminder;
        int neg_adj = 0;
+       bool xmac;
+
+       xmac = priv->plat->has_gmac4 || priv->plat->has_xgmac;
 
        if (delta < 0) {
                neg_adj = 1;
@@ -82,8 +85,7 @@ static int stmmac_adjust_time(struct ptp_clock_info *ptp, s64 
delta)
        nsec = reminder;
 
        spin_lock_irqsave(&priv->ptp_lock, flags);
-       stmmac_adjust_systime(priv, priv->ptpaddr, sec, nsec, neg_adj,
-                       priv->plat->has_gmac4);
+       stmmac_adjust_systime(priv, priv->ptpaddr, sec, nsec, neg_adj, xmac);
        spin_unlock_irqrestore(&priv->ptp_lock, flags);
 
        return 0;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h 
b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h
index f4b31d69f60e..ecccf895fd7e 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h
@@ -21,6 +21,7 @@
 #ifndef        __STMMAC_PTP_H__
 #define        __STMMAC_PTP_H__
 
+#define PTP_XGMAC_OFFSET       0xd00
 #define        PTP_GMAC4_OFFSET        0xb00
 #define        PTP_GMAC3_X_OFFSET      0x700
 
-- 
2.7.4