diff options
author | Richard Cochran <richardcochran@gmail.com> | 2014-12-21 13:47:00 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-12-30 18:29:26 -0500 |
commit | 59e16961c688a50d4dae9827cc3e5c69ae98e0cb (patch) | |
tree | 81f328ca54babce61b332eacac1b6c68b097b4f8 /drivers/net/ethernet/freescale | |
parent | 2e5601f9aca1a83980a031f9385a95062d12e689 (diff) |
net: fec: convert to timecounter adjtime.
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>
Diffstat (limited to 'drivers/net/ethernet/freescale')
-rw-r--r-- | drivers/net/ethernet/freescale/fec_ptp.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c index 992c8c3db553..1f9cf2345266 100644 --- a/drivers/net/ethernet/freescale/fec_ptp.c +++ b/drivers/net/ethernet/freescale/fec_ptp.c | |||
@@ -374,23 +374,9 @@ static int fec_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta) | |||
374 | struct fec_enet_private *fep = | 374 | struct fec_enet_private *fep = |
375 | container_of(ptp, struct fec_enet_private, ptp_caps); | 375 | container_of(ptp, struct fec_enet_private, ptp_caps); |
376 | unsigned long flags; | 376 | unsigned long flags; |
377 | u64 now; | ||
378 | u32 counter; | ||
379 | 377 | ||
380 | spin_lock_irqsave(&fep->tmreg_lock, flags); | 378 | spin_lock_irqsave(&fep->tmreg_lock, flags); |
381 | 379 | timecounter_adjtime(&fep->tc, delta); | |
382 | now = timecounter_read(&fep->tc); | ||
383 | now += delta; | ||
384 | |||
385 | /* Get the timer value based on adjusted timestamp. | ||
386 | * Update the counter with the masked value. | ||
387 | */ | ||
388 | counter = now & fep->cc.mask; | ||
389 | writel(counter, fep->hwp + FEC_ATIME); | ||
390 | |||
391 | /* reset the timecounter */ | ||
392 | timecounter_init(&fep->tc, &fep->cc, now); | ||
393 | |||
394 | spin_unlock_irqrestore(&fep->tmreg_lock, flags); | 380 | spin_unlock_irqrestore(&fep->tmreg_lock, flags); |
395 | 381 | ||
396 | return 0; | 382 | return 0; |