summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam2013-07-21 18:25:01 +0200
committerDavid S. Miller2013-07-23 01:50:31 +0200
commit79820e725f3ac5db694c49c75088d79fde78b671 (patch)
treee88067d8f02b08eaef4cae721b8cd014bfc3500d
parentfec: Fix the order for enabling/disabling the clocks (diff)
downloadkernel-qcow2-linux-79820e725f3ac5db694c49c75088d79fde78b671.tar.gz
kernel-qcow2-linux-79820e725f3ac5db694c49c75088d79fde78b671.tar.xz
kernel-qcow2-linux-79820e725f3ac5db694c49c75088d79fde78b671.zip
fec: Enable/disable clk_ptp in suspend/resume
clk_ptp should also be enabled in fec_resume() and disabled in fec_suspend(). Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/freescale/fec_main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 5c34fd834d03..0a4ace782c1f 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -2234,6 +2234,8 @@ fec_suspend(struct device *dev)
fec_stop(ndev);
netif_device_detach(ndev);
}
+ if (fep->clk_ptp)
+ clk_disable_unprepare(fep->clk_ptp);
if (fep->clk_enet_out)
clk_disable_unprepare(fep->clk_enet_out);
clk_disable_unprepare(fep->clk_ipg);
@@ -2262,6 +2264,8 @@ fec_resume(struct device *dev)
clk_prepare_enable(fep->clk_ipg);
if (fep->clk_enet_out)
clk_prepare_enable(fep->clk_enet_out);
+ if (fep->clk_ptp)
+ clk_prepare_enable(fep->clk_ptp);
if (netif_running(ndev)) {
fec_restart(ndev, fep->full_duplex);
netif_device_attach(ndev);