diff options
| author | Dinh Nguyen <dinguyen@opensource.altera.com> | 2016-04-15 03:42:29 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-17 03:46:56 +0200 |
| commit | f66bc94174e850a4de4adbe7a08fc37507051185 (patch) | |
| tree | 19cce661e0e826eab103e677f84a6c651b5ea8f6 /drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | |
| parent | dsa: mv88e6xxx: Kill the REG_READ and REG_WRITE macros (diff) | |
| download | linux-f66bc94174e850a4de4adbe7a08fc37507051185.tar.xz linux-f66bc94174e850a4de4adbe7a08fc37507051185.zip | |
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c index f0d797ab74d8..41f4c58b22bd 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c @@ -267,12 +267,6 @@ static int socfpga_dwmac_probe(struct platform_device *pdev) return ret; } - ret = socfpga_dwmac_setup(dwmac); - if (ret) { - dev_err(dev, "couldn't setup SoC glue (%d)\n", ret); - return ret; - } - plat_dat->bsp_priv = dwmac; plat_dat->init = socfpga_dwmac_init; plat_dat->exit = socfpga_dwmac_exit; |