Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-14 00:47:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

net: fec_mxc: fix PHY initialization bug with CONFIG_DM_ETH

Browse source 
When CONFIG_DM_ETH is set, the FEC ethernet controller is reset after
the PHY has been set up and initialzed. This breaks the communication
with the PHY and results in an inoperable ethernet interface.

Do the initialization with CONFIG_DM_ETH in the same order as with
legacy ETH support to fix this.

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Lothar Waßmann 2017-06-27 15:23:16 +02:00 committed by Stefano Babic
parent 34d45d123a
commit 306dd7dabd
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/net/fec_mxc.c
View file

@ -1223,17 +1223,6 @@ static int fecmxc_probe(struct udevice *dev)
if (ret) if (ret)
return ret; return ret;
bus = fec_get_miibus((uint32_t)priv->eth, dev_id);
if (!bus)
goto err_mii;
priv->bus = bus;
priv->xcv_type = CONFIG_FEC_XCV_TYPE;
priv->interface = pdata->phy_interface;
ret = fec_phy_init(priv, dev);
if (ret)
goto err_phy;
/* Reset chip. */ /* Reset chip. */
writel(readl(&priv->eth->ecntrl) | FEC_ECNTRL_RESET, writel(readl(&priv->eth->ecntrl) | FEC_ECNTRL_RESET,
&priv->eth->ecntrl); &priv->eth->ecntrl);
@ -1249,6 +1238,19 @@ static int fecmxc_probe(struct udevice *dev)
fec_reg_setup(priv); fec_reg_setup(priv);
priv->dev_id = (dev_id == -1) ? 0 : dev_id; priv->dev_id = (dev_id == -1) ? 0 : dev_id;
bus = fec_get_miibus(dev, dev_id);
if (!bus) {
ret = -ENOMEM;
goto err_mii;
}
priv->bus = bus;
priv->xcv_type = CONFIG_FEC_XCV_TYPE;
priv->interface = pdata->phy_interface;
ret = fec_phy_init(priv, dev);
if (ret)
goto err_phy;
return 0; return 0;
err_timeout: err_timeout: