ptp: idt82p33: remove PEROUT_ENABLE_OUTPUT_MASK
authorMin Li <min.li.xe@renesas.com>
Wed, 23 Nov 2022 19:52:07 +0000 (14:52 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 25 Nov 2022 10:34:08 +0000 (10:34 +0000)
PEROUT_ENABLE_OUTPUT_MASK was there to allow us to enable/disable
all the perout pins. But it is not standard procedure, we will
have to discard it.

Signed-off-by: Min Li <min.li.xe@renesas.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/ptp/ptp_idt82p33.c
drivers/ptp/ptp_idt82p33.h

index aece499..afc76c2 100644 (file)
@@ -895,40 +895,10 @@ static int idt82p33_output_enable(struct idt82p33_channel *channel,
        return idt82p33_write(idt82p33, OUT_MUX_CNFG(outn), &val, sizeof(val));
 }
 
-static int idt82p33_output_mask_enable(struct idt82p33_channel *channel,
-                                      bool enable)
-{
-       u16 mask;
-       int err;
-       u8 outn;
-
-       mask = channel->output_mask;
-       outn = 0;
-
-       while (mask) {
-               if (mask & 0x1) {
-                       err = idt82p33_output_enable(channel, enable, outn);
-                       if (err)
-                               return err;
-               }
-
-               mask >>= 0x1;
-               outn++;
-       }
-
-       return 0;
-}
-
 static int idt82p33_perout_enable(struct idt82p33_channel *channel,
                                  bool enable,
                                  struct ptp_perout_request *perout)
 {
-       unsigned int flags = perout->flags;
-
-       /* Enable/disable output based on output_mask */
-       if (flags == PEROUT_ENABLE_OUTPUT_MASK)
-               return idt82p33_output_mask_enable(channel, enable);
-
        /* Enable/disable individual output instead */
        return idt82p33_output_enable(channel, enable, perout->index);
 }
@@ -939,10 +909,6 @@ static int idt82p33_enable_tod(struct idt82p33_channel *channel)
        struct timespec64 ts = {0, 0};
        int err;
 
-       /* STEELAI-366 - Temporary workaround for ts2phc compatibility */
-       if (0)
-               err = idt82p33_output_mask_enable(channel, false);
-
        err = idt82p33_measure_tod_write_overhead(channel);
 
        if (err) {
index cddebf0..8fcb0b1 100644 (file)
@@ -22,7 +22,6 @@
 #define IMMEDIATE_SNAP_THRESHOLD_NS (50000)
 #define DDCO_THRESHOLD_NS      (5)
 #define IDT82P33_MAX_WRITE_COUNT       (512)
-#define PEROUT_ENABLE_OUTPUT_MASK      (0xdeadbeef)
 
 #define PLLMASK_ADDR_HI        0xFF
 #define PLLMASK_ADDR_LO        0xA5