From: Tom Rini Date: Tue, 24 May 2016 15:59:02 +0000 (-0400) Subject: Merge branch 'master' of git://git.denx.de/u-boot-net X-Git-Url: http://git.dujemihanovic.xyz/img/static/git-favicon.png?a=commitdiff_plain;h=2ee490a0245b65826a8ce8e42e34c9bf805d3656;p=u-boot.git Merge branch 'master' of git://git.denx.de/u-boot-net Signed-off-by: Tom Rini Conflicts: drivers/net/zynq_gem.c --- 2ee490a0245b65826a8ce8e42e34c9bf805d3656 diff --cc drivers/net/zynq_gem.c index 4d9c296c0b,f9b22c4de2..519699d8ff --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@@ -353,7 -354,12 +354,10 @@@ static int zynq_phy_init(struct udevic ADVERTISED_Asym_Pause; priv->phydev->advertising = priv->phydev->supported; + if (priv->phy_of_handle > 0) + priv->phydev->dev->of_offset = priv->phy_of_handle; + - phy_config(priv->phydev); - - return 0; + return phy_config(priv->phydev); } static int zynq_gem_init(struct udevice *dev)