Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 352130
b: refs/heads/master
c: 85bd179
h: refs/heads/master
v: v3
  • Loading branch information
Frank Li authored and David S. Miller committed Feb 8, 2013
1 parent 1752c69 commit d98e104
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 365cc174648cd7e9b11e522c3d5b07ccf3c60d99
refs/heads/master: 85bd1798b24a13462d7b064961e7a9da3bb12db1
4 changes: 3 additions & 1 deletion trunk/drivers/net/ethernet/freescale/fec_ptp.c
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ void fec_ptp_start_cyclecounter(struct net_device *ndev)
unsigned long flags;
int inc;

inc = 1000000000 / clk_get_rate(fep->clk_ptp);
inc = 1000000000 / fep->cycle_speed;

/* grab the ptp lock */
spin_lock_irqsave(&fep->tmreg_lock, flags);
Expand Down Expand Up @@ -363,6 +363,8 @@ void fec_ptp_init(struct net_device *ndev, struct platform_device *pdev)
fep->ptp_caps.settime = fec_ptp_settime;
fep->ptp_caps.enable = fec_ptp_enable;

fep->cycle_speed = clk_get_rate(fep->clk_ptp);

spin_lock_init(&fep->tmreg_lock);

fec_ptp_start_cyclecounter(ndev);
Expand Down

0 comments on commit d98e104

Please sign in to comment.