Skip to content

Commit

Permalink
net: fec: reset phy after pinctrl setup
Browse files Browse the repository at this point in the history
In case that bootloader or platform initialization does not set up
fec pins, the fec_reset_phy will not be able to succeed, because
fec_reset_phy is currently called before devm_pinctrl_get_select_default.
Move fec_reset_phy call to the place between devm_pinctrl_get_select_default
and fec_enet_init to have above case be taken care.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Shawn Guo authored and David S. Miller committed Jun 28, 2012
1 parent d2e553b commit 2ca9b2a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/ethernet/freescale/fec.c
Original file line number Diff line number Diff line change
Expand Up @@ -1593,8 +1593,6 @@ fec_probe(struct platform_device *pdev)
fep->phy_interface = ret;
}

fec_reset_phy(pdev);

for (i = 0; i < FEC_IRQ_NUM; i++) {
irq = platform_get_irq(pdev, i);
if (irq < 0) {
Expand Down Expand Up @@ -1634,6 +1632,8 @@ fec_probe(struct platform_device *pdev)
clk_prepare_enable(fep->clk_ahb);
clk_prepare_enable(fep->clk_ipg);

fec_reset_phy(pdev);

ret = fec_enet_init(ndev);
if (ret)
goto failed_init;
Expand Down

0 comments on commit 2ca9b2a

Please sign in to comment.