Permalink
Browse files

stmmac: socfpga: remove extra call to socfpga_dwmac_setup

In the socfpga_dwmac_probe function, we have a call to socfpga_dwmac_setup,
which is already called from socfpga_dwmac_init later in the probe function.
Remove this extra call to socfpga_dwmac_setup.

Also we should not be calling socfpga_dwmac_setup() directly without wrapping
it around the proper reset assert/deasserts. That is because the
socfpga_dwmac_setup() is setting up PHY modes in the system manager, and it
is requires the EMAC's to be in reset during the PHY setup.

Reported-by: Matthew Gerlach <mgerlach@opensource.altera.com>
Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
  • Loading branch information...
1 parent 3367642 commit 96a5ee8ad22403b6a314c2695cbcb0f3720c14cc Dinh Nguyen committed Apr 14, 2016
Showing with 0 additions and 6 deletions.
  1. +0 −6 drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
@@ -191,12 +191,6 @@ static void *socfpga_dwmac_probe(struct platform_device *pdev)
return ERR_PTR(ret);
}
- ret = socfpga_dwmac_setup(dwmac);
- if (ret) {
- dev_err(dev, "couldn't setup SoC glue (%d)\n", ret);
- return ERR_PTR(ret);
- }
-
return dwmac;
}

0 comments on commit 96a5ee8

Please sign in to comment.