| Message ID | 1359470773-14290-2-git-send-email-w.sang@pengutronix.de |
|---|---|
| State | RFC, archived |
| Delegated to: | David Miller |
| Headers | show |
Thanks for working on this, Wolfram. On Tue, Jan 29, 2013 at 03:46:11PM +0100, Wolfram Sang wrote: > 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> Acked-by: Shawn Guo <shawn.guo@linaro.org> > --- > > davidm: Please don't apply before Shawn as the mxs-maintainer has given his ack > on the general procedure. Or maybe he can merge it via his tree? > I prefer to have the patch go via net tree for 3.9, and then we clean up mxs platform code from 3.9-rc1. Shawn -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Jan 30, 2013 at 01:25:50PM +0800, Shawn Guo wrote: > Thanks for working on this, Wolfram. > > On Tue, Jan 29, 2013 at 03:46:11PM +0100, Wolfram Sang wrote: > > 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> > > Acked-by: Shawn Guo <shawn.guo@linaro.org> > > > --- > > > > davidm: Please don't apply before Shawn as the mxs-maintainer has given his ack > > on the general procedure. Or maybe he can merge it via his tree? > > > I prefer to have the patch go via net tree for 3.9, and then we clean > up mxs platform code from 3.9-rc1. Fine with me, too.
diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c index 0704bca..6573bd5 100644 --- a/drivers/net/ethernet/freescale/fec.c +++ b/drivers/net/ethernet/freescale/fec.c @@ -1628,6 +1628,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; + #ifdef CONFIG_FEC_PTP fep->clk_ptp = devm_clk_get(&pdev->dev, "ptp"); if (IS_ERR(fep->clk_ptp)) { @@ -1638,6 +1643,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); #ifdef CONFIG_FEC_PTP clk_prepare_enable(fep->clk_ptp); #endif @@ -1679,6 +1685,7 @@ failed_register: failed_mii_init: failed_init: failed_regulator: + clk_disable_unprepare(fep->clk_enet_out); clk_disable_unprepare(fep->clk_ahb); clk_disable_unprepare(fep->clk_ipg); #ifdef CONFIG_FEC_PTP @@ -1722,6 +1729,7 @@ fec_drv_remove(struct platform_device *pdev) if (fep->ptp_clock) ptp_clock_unregister(fep->ptp_clock); #endif + clk_disable_unprepare(fep->clk_enet_out); clk_disable_unprepare(fep->clk_ahb); clk_disable_unprepare(fep->clk_ipg); iounmap(fep->hwp); @@ -1747,6 +1755,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); @@ -1759,6 +1768,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)) { diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h index c5a3bc1..0648dbe 100644 --- a/drivers/net/ethernet/freescale/fec.h +++ b/drivers/net/ethernet/freescale/fec.h @@ -203,6 +203,7 @@ struct fec_enet_private { struct clk *clk_ipg; struct clk *clk_ahb; + struct clk *clk_enet_out; #ifdef CONFIG_FEC_PTP struct clk *clk_ptp; #endif
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> --- davidm: Please don't apply before Shawn as the mxs-maintainer has given his ack on the general procedure. Or maybe he can merge it via his tree? drivers/net/ethernet/freescale/fec.c | 10 ++++++++++ drivers/net/ethernet/freescale/fec.h | 1 + 2 files changed, 11 insertions(+)