net: dsa: microchip: Use regs[] to access REG_PTP_SUBNANOSEC_RATE

Accesses to the PTP_SUBNANOSEC_RATE register are done through a
hardcoded address which doesn't match with the KSZ8463's register
layout.

Add a new entry for the PTP_SUBNANOSEC_RATE register in the regs[]
tables.
Use the regs[] table to retrieve the PTP_SUBNANOSEC_RATE register
address when accessing it.
Remove the macro defining the address to prevent further use.

Signed-off-by: Bastien Curutchet (Schneider Electric) <bastien.curutchet@bootlin.com>
Link: https://patch.msgid.link/20260105-ksz-rework-v1-7-a68df7f57375@bootlin.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index 7af008cafccf716c2114f486938cdc25b7daae73..cbd918c0add30da17ea6ebe44ff44b866fcf2a1f 100644 (file)
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -573,6 +573,7 @@ static const u16 ksz8463_regs[] = {
        [PTP_RTC_NANOSEC]               = 0x0604,
        [PTP_RTC_SEC]                   = 0x0608,
        [PTP_RTC_SUB_NANOSEC]           = 0x060C,
+       [PTP_SUBNANOSEC_RATE]           = 0x0610,
 };
 
 static const u32 ksz8463_masks[] = {
@@ -811,6 +812,7 @@ static const u16 ksz9477_regs[] = {
        [PTP_RTC_SUB_NANOSEC]           = 0x0502,
        [PTP_RTC_NANOSEC]               = 0x0504,
        [PTP_RTC_SEC]                   = 0x0508,
+       [PTP_SUBNANOSEC_RATE]           = 0x050C,
 };
 
 static const u32 ksz9477_masks[] = {

diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h
index d1baa3ce09b5fee8e0984791a730b70b704fcfdd..16a7600789e3233dab1e1ed5d4599b875aa57aa1 100644 (file)
--- a/drivers/net/dsa/microchip/ksz_common.h
+++ b/drivers/net/dsa/microchip/ksz_common.h
@@ -275,6 +275,7 @@ enum ksz_regs {
        PTP_RTC_NANOSEC,
        PTP_RTC_SEC,
        PTP_RTC_SUB_NANOSEC,
+       PTP_SUBNANOSEC_RATE,
 };
 
 enum ksz_masks {

diff --git a/drivers/net/dsa/microchip/ksz_ptp.c b/drivers/net/dsa/microchip/ksz_ptp.c
index 3766d8bde478e6c2cf0ec19e7ac27570c2bb7676..538162e3e4569483c85c710182cb3918a8713d74 100644 (file)
--- a/drivers/net/dsa/microchip/ksz_ptp.c
+++ b/drivers/net/dsa/microchip/ksz_ptp.c
@@ -742,7 +742,7 @@ static int ksz_ptp_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)
                if (!negative)
                        data32 |= PTP_RATE_DIR;
 
-               ret = ksz_write32(dev, REG_PTP_SUBNANOSEC_RATE, data32);
+               ret = ksz_write32(dev, regs[PTP_SUBNANOSEC_RATE], data32);
                if (ret)
                        goto unlock;
 

diff --git a/drivers/net/dsa/microchip/ksz_ptp_reg.h b/drivers/net/dsa/microchip/ksz_ptp_reg.h
index 41891ddadaa30ce2cf3ac41273fd335987258230..1e823b1a19daa480cccdc0367b436a0940e85093 100644 (file)
--- a/drivers/net/dsa/microchip/ksz_ptp_reg.h
+++ b/drivers/net/dsa/microchip/ksz_ptp_reg.h
@@ -28,8 +28,7 @@
 #define PTP_RTC_SUB_NANOSEC_M          0x0007
 #define PTP_RTC_0NS                    0x00
 
-#define REG_PTP_SUBNANOSEC_RATE                0x050C
-
+/* REG_PTP_SUBNANOSEC_RATE */
 #define PTP_SUBNANOSEC_M               0x3FFFFFFF
 #define PTP_RATE_DIR                   BIT(31)
 #define PTP_TMP_RATE_ENABLE            BIT(30)