diff options
author | Michal Simek <michal.simek@xilinx.com> | 2019-03-29 09:25:09 +0100 |
---|---|---|
committer | Michal Simek <michal.simek@xilinx.com> | 2019-04-16 11:52:02 +0200 |
commit | c19d4c72aa7026c82c1b1a310c3bb26e1e7a8f1d (patch) | |
tree | 02db086d50fbb3bbbb2255f7c3b9bd1b81740af0 /drivers/net/zynq_gem.c | |
parent | 51c019ff8cb530b96fca037dd5728cce255cb6e5 (diff) | |
download | u-boot-c19d4c72aa7026c82c1b1a310c3bb26e1e7a8f1d.zip u-boot-c19d4c72aa7026c82c1b1a310c3bb26e1e7a8f1d.tar.gz u-boot-c19d4c72aa7026c82c1b1a310c3bb26e1e7a8f1d.tar.bz2 |
net: gem: Remove phy autodetection code
There is no reason to detect phy when core is doing it for us.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'drivers/net/zynq_gem.c')
-rw-r--r-- | drivers/net/zynq_gem.c | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index 94a04fe..033efb8 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -261,45 +261,6 @@ static int phywrite(struct zynq_gem_priv *priv, u32 phy_addr, ZYNQ_GEM_PHYMNTNC_OP_W_MASK, &data); } -static int phy_detection(struct udevice *dev) -{ - int i; - u16 phyreg = 0; - struct zynq_gem_priv *priv = dev->priv; - - if (priv->phyaddr != -1) { - phyread(priv, priv->phyaddr, PHY_DETECT_REG, &phyreg); - if ((phyreg != 0xFFFF) && - ((phyreg & PHY_DETECT_MASK) == PHY_DETECT_MASK)) { - /* Found a valid PHY address */ - debug("Default phy address %d is valid\n", - priv->phyaddr); - return 0; - } else { - debug("PHY address is not setup correctly %d\n", - priv->phyaddr); - priv->phyaddr = -1; - } - } - - debug("detecting phy address\n"); - if (priv->phyaddr == -1) { - /* detect the PHY address */ - for (i = 31; i >= 0; i--) { - phyread(priv, i, PHY_DETECT_REG, &phyreg); - if ((phyreg != 0xFFFF) && - ((phyreg & PHY_DETECT_MASK) == PHY_DETECT_MASK)) { - /* Found a valid PHY address */ - priv->phyaddr = i; - debug("Found valid phy address, %d\n", i); - return 0; - } - } - } - printf("PHY is not detected\n"); - return -1; -} - static int zynq_gem_setup_mac(struct udevice *dev) { u32 i, macaddrlow, macaddrhigh; @@ -345,15 +306,6 @@ static int zynq_phy_init(struct udevice *dev) /* Enable only MDIO bus */ writel(ZYNQ_GEM_NWCTRL_MDEN_MASK, ®s->nwctrl); - if ((priv->interface != PHY_INTERFACE_MODE_SGMII) && - (priv->interface != PHY_INTERFACE_MODE_GMII)) { - ret = phy_detection(dev); - if (ret) { - printf("GEM PHY init failed\n"); - return ret; - } - } - priv->phydev = phy_connect(priv->bus, priv->phyaddr, dev, priv->interface); if (!priv->phydev) |