Merge branch 'for-upstream' of git://openrisc.net/jonas/linux

[karo-tx-linux.git] / drivers / net / ethernet / freescale / fec_ptp.c

diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c
index c40526c78c2024387a6f2452b769813d1120f08c..1f17ca0f22019d8350af2affdcc6b00739ce966f 100644 (file)
--- a/drivers/net/ethernet/freescale/fec_ptp.c
+++ b/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);