net: dsa: mv88e6xxx: remove unused support for PPS event capture

mv88e6352_config_eventcap() is documented as handling both EXTTS and
PPS capture modes, but nothing ever calls it for PPS capture. Remove
the unused PPS capture mode support, and the now unused
MV88E6XXX_TAI_EVENT_STATUS_CAP_TRIG definition.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1uwep9-00000004ikJ-2FeF@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/dsa/mv88e6xxx/ptp.c b/drivers/net/dsa/mv88e6xxx/ptp.c
index 350f1d5c05f484cbf44dbb938a428bbdc98b54e6..89fb61ea891d5f54e9ab254600acb799956d82af 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/ptp.c
+++ b/drivers/net/dsa/mv88e6xxx/ptp.c
@@ -167,16 +167,13 @@ static u64 mv88e6165_ptp_clock_read(struct cyclecounter *cc)
 }
 
 /* mv88e6352_config_eventcap - configure TAI event capture
- * @event: PTP_CLOCK_PPS (internal) or PTP_CLOCK_EXTTS (external)
  * @rising: zero for falling-edge trigger, else rising-edge trigger
  *
  * This will also reset the capture sequence counter.
  */
-static int mv88e6352_config_eventcap(struct mv88e6xxx_chip *chip, int event,
-                                    int rising)
+static int mv88e6352_config_eventcap(struct mv88e6xxx_chip *chip, int rising)
 {
        u16 evcap_config;
-       u16 cap_config;
        int err;
 
        evcap_config = MV88E6XXX_TAI_CFG_CAP_OVERWRITE |
@@ -188,20 +185,8 @@ static int mv88e6352_config_eventcap(struct mv88e6xxx_chip *chip, int event,
        if (err)
                return err;
 
-       if (event == PTP_CLOCK_PPS) {
-               cap_config = MV88E6XXX_TAI_EVENT_STATUS_CAP_TRIG;
-       } else if (event == PTP_CLOCK_EXTTS) {
-               /* if STATUS_CAP_TRIG is unset we capture PTP_EVREQ events */
-               cap_config = 0;
-       } else {
-               return -EINVAL;
-       }
-
        /* Write the capture config; this also clears the capture counter */
-       err = mv88e6xxx_tai_write(chip, MV88E6XXX_TAI_EVENT_STATUS,
-                                 cap_config);
-
-       return err;
+       return mv88e6xxx_tai_write(chip, MV88E6XXX_TAI_EVENT_STATUS, 0);
 }
 
 static void mv88e6352_tai_event_work(struct work_struct *ugly)
@@ -354,7 +339,7 @@ static int mv88e6352_ptp_enable_extts(struct mv88e6xxx_chip *chip,
                schedule_delayed_work(&chip->tai_event_work,
                                      TAI_EVENT_WORK_INTERVAL);
 
-               err = mv88e6352_config_eventcap(chip, PTP_CLOCK_EXTTS, rising);
+               err = mv88e6352_config_eventcap(chip, rising);
        } else {
                func = MV88E6352_G2_SCRATCH_GPIO_PCTL_GPIO;
 

diff --git a/drivers/net/dsa/mv88e6xxx/ptp.h b/drivers/net/dsa/mv88e6xxx/ptp.h
index 24b824f42046dc7544942348a08ea162490986b2..b3fd177d67e308958a3ba9e78fe3db6eeea5fdee 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/ptp.h
+++ b/drivers/net/dsa/mv88e6xxx/ptp.h
@@ -54,7 +54,6 @@
 
 /* Offset 0x09: Event Status */
 #define MV88E6XXX_TAI_EVENT_STATUS             0x09
-#define MV88E6XXX_TAI_EVENT_STATUS_CAP_TRIG    0x4000
 #define MV88E6XXX_TAI_EVENT_STATUS_ERROR       0x0200
 #define MV88E6XXX_TAI_EVENT_STATUS_VALID       0x0100
 #define MV88E6XXX_TAI_EVENT_STATUS_CTR_MASK    0x00ff