From d98e104134a001ab232e42225437606f08106a15 Mon Sep 17 00:00:00 2001 From: Frank Li Date: Wed, 6 Feb 2013 14:59:59 +0000 Subject: [PATCH] --- yaml --- r: 352130 b: refs/heads/master c: 85bd1798b24a13462d7b064961e7a9da3bb12db1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/freescale/fec_ptp.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 20dcc5abd8b7..b1e0a372aee1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 365cc174648cd7e9b11e522c3d5b07ccf3c60d99 +refs/heads/master: 85bd1798b24a13462d7b064961e7a9da3bb12db1 diff --git a/trunk/drivers/net/ethernet/freescale/fec_ptp.c b/trunk/drivers/net/ethernet/freescale/fec_ptp.c index c40526c78c20..1f17ca0f2201 100644 --- a/trunk/drivers/net/ethernet/freescale/fec_ptp.c +++ b/trunk/drivers/net/ethernet/freescale/fec_ptp.c @@ -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); @@ -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);