FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-15 13:22:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: fec: add clk_prepare/clk_unprepare

Browse Source 
It's for migrating to generic clk framework API.

Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Cc: David S. Miller <davem@davemloft.net>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
This commit is contained in:
Richard Zhao 2011-11-15 14:48:07 +08:00 committed by Shawn Guo
parent ae68f7af05
commit 0ebafefcaa
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/ethernet/freescale/fec.c
View File

@ -1591,7 +1591,7 @@ fec_probe(struct platform_device *pdev)
ret = PTR_ERR(fep->clk); ret = PTR_ERR(fep->clk);
goto failed_clk; goto failed_clk;
} }
clk_enable(fep->clk); clk_prepare_enable(fep->clk);
ret = fec_enet_init(ndev); ret = fec_enet_init(ndev);
if (ret) if (ret)
@ -1614,7 +1614,7 @@ failed_register:
fec_enet_mii_remove(fep); fec_enet_mii_remove(fep);
failed_mii_init: failed_mii_init:
failed_init: failed_init:
clk_disable(fep->clk); clk_disable_unprepare(fep->clk);
clk_put(fep->clk); clk_put(fep->clk);
failed_clk: failed_clk:
for (i = 0; i < FEC_IRQ_NUM; i++) { for (i = 0; i < FEC_IRQ_NUM; i++) {
@ -1641,7 +1641,7 @@ fec_drv_remove(struct platform_device *pdev)
fec_stop(ndev); fec_stop(ndev);
fec_enet_mii_remove(fep); fec_enet_mii_remove(fep);
clk_disable(fep->clk); clk_disable_unprepare(fep->clk);
clk_put(fep->clk); clk_put(fep->clk);
iounmap(fep->hwp); iounmap(fep->hwp);
unregister_netdev(ndev); unregister_netdev(ndev);
@ -1667,7 +1667,7 @@ fec_suspend(struct device *dev)
fec_stop(ndev); fec_stop(ndev);
netif_device_detach(ndev); netif_device_detach(ndev);
} }
clk_disable(fep->clk); clk_disable_unprepare(fep->clk);
return 0; return 0;
} }
@ -1678,7 +1678,7 @@ fec_resume(struct device *dev)
struct net_device *ndev = dev_get_drvdata(dev); struct net_device *ndev = dev_get_drvdata(dev);
struct fec_enet_private *fep = netdev_priv(ndev); struct fec_enet_private *fep = netdev_priv(ndev);
clk_enable(fep->clk); clk_prepare_enable(fep->clk);
if (netif_running(ndev)) { if (netif_running(ndev)) {
fec_restart(ndev, fep->full_duplex); fec_restart(ndev, fep->full_duplex);
netif_device_attach(ndev); netif_device_attach(ndev);