|
@@ -1609,7 +1609,6 @@ static int fec_enet_init(struct net_device *ndev)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
spin_lock_init(&fep->hw_lock);
|
|
spin_lock_init(&fep->hw_lock);
|
|
|
- spin_lock_init(&fep->tmreg_lock);
|
|
|
|
|
|
|
|
|
|
fep->netdev = ndev;
|
|
fep->netdev = ndev;
|
|
|
|
|
|
|
@@ -1841,6 +1840,9 @@ fec_probe(struct platform_device *pdev)
|
|
|
|
|
|
|
|
fec_reset_phy(pdev);
|
|
fec_reset_phy(pdev);
|
|
|
|
|
|
|
|
|
|
+ if (fep->bufdesc_ex)
|
|
|
|
|
+ fec_ptp_init(ndev, pdev);
|
|
|
|
|
+
|
|
|
ret = fec_enet_init(ndev);
|
|
ret = fec_enet_init(ndev);
|
|
|
if (ret)
|
|
if (ret)
|
|
|
goto failed_init;
|
|
goto failed_init;
|
|
@@ -1856,9 +1858,6 @@ fec_probe(struct platform_device *pdev)
|
|
|
if (ret)
|
|
if (ret)
|
|
|
goto failed_register;
|
|
goto failed_register;
|
|
|
|
|
|
|
|
- if (fep->bufdesc_ex)
|
|
|
|
|
- fec_ptp_init(ndev, pdev);
|
|
|
|
|
-
|
|
|
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
|
|
failed_register:
|
|
failed_register:
|