Skip to content

Commit

Permalink
net: freescale: fec: add support for optional enet_out clk
Browse files Browse the repository at this point in the history
Some MX28 boards need the internal enet_out clock to be enabled. So, do
this in the driver iff the clock was referenced via devicetree.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Wolfram Sang authored and Shawn Guo committed Apr 4, 2013
1 parent c29dc2d commit daa7d39
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
10 changes: 10 additions & 0 deletions drivers/net/ethernet/freescale/fec.c
Original file line number Diff line number Diff line change
Expand Up @@ -1802,6 +1802,11 @@ fec_probe(struct platform_device *pdev)
goto failed_clk;
}

/* enet_out is optional, depends on board */
fep->clk_enet_out = devm_clk_get(&pdev->dev, "enet_out");
if (IS_ERR(fep->clk_enet_out))
fep->clk_enet_out = NULL;

fep->clk_ptp = devm_clk_get(&pdev->dev, "ptp");
fep->bufdesc_ex =
pdev->id_entry->driver_data & FEC_QUIRK_HAS_BUFDESC_EX;
Expand All @@ -1812,6 +1817,7 @@ fec_probe(struct platform_device *pdev)

clk_prepare_enable(fep->clk_ahb);
clk_prepare_enable(fep->clk_ipg);
clk_prepare_enable(fep->clk_enet_out);
clk_prepare_enable(fep->clk_ptp);

reg_phy = devm_regulator_get(&pdev->dev, "phy");
Expand Down Expand Up @@ -1877,6 +1883,7 @@ fec_probe(struct platform_device *pdev)
failed_regulator:
clk_disable_unprepare(fep->clk_ahb);
clk_disable_unprepare(fep->clk_ipg);
clk_disable_unprepare(fep->clk_enet_out);
clk_disable_unprepare(fep->clk_ptp);
failed_pin:
failed_clk:
Expand All @@ -1903,6 +1910,7 @@ fec_drv_remove(struct platform_device *pdev)
clk_disable_unprepare(fep->clk_ptp);
if (fep->ptp_clock)
ptp_clock_unregister(fep->ptp_clock);
clk_disable_unprepare(fep->clk_enet_out);
clk_disable_unprepare(fep->clk_ahb);
clk_disable_unprepare(fep->clk_ipg);
for (i = 0; i < FEC_IRQ_NUM; i++) {
Expand Down Expand Up @@ -1933,6 +1941,7 @@ fec_suspend(struct device *dev)
fec_stop(ndev);
netif_device_detach(ndev);
}
clk_disable_unprepare(fep->clk_enet_out);
clk_disable_unprepare(fep->clk_ahb);
clk_disable_unprepare(fep->clk_ipg);

Expand All @@ -1945,6 +1954,7 @@ fec_resume(struct device *dev)
struct net_device *ndev = dev_get_drvdata(dev);
struct fec_enet_private *fep = netdev_priv(ndev);

clk_prepare_enable(fep->clk_enet_out);
clk_prepare_enable(fep->clk_ahb);
clk_prepare_enable(fep->clk_ipg);
if (netif_running(ndev)) {
Expand Down
1 change: 1 addition & 0 deletions drivers/net/ethernet/freescale/fec.h
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ struct fec_enet_private {

struct clk *clk_ipg;
struct clk *clk_ahb;
struct clk *clk_enet_out;
struct clk *clk_ptp;

/* The saved address of a sent-in-place packet/buffer, for skfree(). */
Expand Down

0 comments on commit daa7d39

Please sign in to comment.