Skip to content

Commit

Permalink
ptp: idt82p33: remove PEROUT_ENABLE_OUTPUT_MASK
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Min Li authored and David S. Miller committed Nov 25, 2022
1 parent ad3cc77 commit 46da4aa
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 35 deletions.
34 changes: 0 additions & 34 deletions drivers/ptp/ptp_idt82p33.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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) {
Expand Down
1 change: 0 additions & 1 deletion drivers/ptp/ptp_idt82p33.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 46da4aa

Please sign in to comment.