Skip to content

Commit

Permalink
net: fec: convert to timecounter adjtime.
Browse files Browse the repository at this point in the history
This patch changes the driver to use the new and improved method
for adjusting the offset of a timecounter.

Compile tested only.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Richard Cochran authored and David S. Miller committed Dec 30, 2014
1 parent 2e5601f commit 59e1696
Showing 1 changed file with 1 addition and 15 deletions.
16 changes: 1 addition & 15 deletions drivers/net/ethernet/freescale/fec_ptp.c
Original file line number Diff line number Diff line change
Expand Up @@ -374,23 +374,9 @@ static int fec_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
struct fec_enet_private *fep =
container_of(ptp, struct fec_enet_private, ptp_caps);
unsigned long flags;
u64 now;
u32 counter;

spin_lock_irqsave(&fep->tmreg_lock, flags);

now = timecounter_read(&fep->tc);
now += delta;

/* Get the timer value based on adjusted timestamp.
* Update the counter with the masked value.
*/
counter = now & fep->cc.mask;
writel(counter, fep->hwp + FEC_ATIME);

/* reset the timecounter */
timecounter_init(&fep->tc, &fep->cc, now);

timecounter_adjtime(&fep->tc, delta);
spin_unlock_irqrestore(&fep->tmreg_lock, flags);

return 0;
Expand Down

0 comments on commit 59e1696

Please sign in to comment.