Merge branch 'master' of git://git.denx.de/u-boot-net

Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
	drivers/net/zynq_gem.c

diff --cc drivers/net/phy/phy.c
Simple merge

diff --cc drivers/net/zynq_gem.c
index 4d9c296c0ba9019451c4236ac5000c2f54ba06c5,f9b22c4de277d15aa5b08cbd206214d9517c8021..519699d8ff020fb1b64ed12d763658b46502acd2
--- 1/drivers/net/zynq_gem.c
--- 2/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;
  
 -      phy_config(priv->phydev);
 -
 -      return 0;
+       if (priv->phy_of_handle > 0)
+               priv->phydev->dev->of_offset = priv->phy_of_handle;
+ 
 +      return phy_config(priv->phydev);
  }
  
  static int zynq_gem_init(struct udevice *dev)