GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 22:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: gem: Do not continue if phy is not found

Browse source 
Add return value for phy detection algorithm to stop init function when
phy is not found.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Jagan Teki <jteki@openedev.com>
This commit is contained in:
Michal Simek 2015-11-30 13:38:32 +01:00
parent 3cbbc2574b
commit b904725a11
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/net/zynq_gem.c
View file

@ -241,7 +241,7 @@ static u32 phywrite(struct eth_device *dev, u32 phy_addr, u32 regnum, u16 data)
ZYNQ_GEM_PHYMNTNC_OP_W_MASK, &data); ZYNQ_GEM_PHYMNTNC_OP_W_MASK, &data);
} }
static void phy_detection(struct eth_device *dev) static int phy_detection(struct eth_device *dev)
{ {
int i; int i;
u16 phyreg; u16 phyreg;
@ -254,7 +254,7 @@ static void phy_detection(struct eth_device *dev)
/* Found a valid PHY address */ /* Found a valid PHY address */
debug("Default phy address %d is valid\n", debug("Default phy address %d is valid\n",
priv->phyaddr); priv->phyaddr);
return; return 0;
} else { } else {
debug("PHY address is not setup correctly %d\n", debug("PHY address is not setup correctly %d\n",
priv->phyaddr); priv->phyaddr);
@ -272,11 +272,12 @@ static void phy_detection(struct eth_device *dev)
/* Found a valid PHY address */ /* Found a valid PHY address */
priv->phyaddr = i; priv->phyaddr = i;
debug("Found valid phy address, %d\n", i); debug("Found valid phy address, %d\n", i);
return; return 0;
} }
} }
} }
printf("PHY is not detected\n"); printf("PHY is not detected\n");
return -1;
} }
static int zynq_gem_setup_mac(struct eth_device *dev) static int zynq_gem_setup_mac(struct eth_device *dev)
@ -310,6 +311,7 @@ static int zynq_gem_setup_mac(struct eth_device *dev)
static int zynq_gem_init(struct eth_device *dev, bd_t * bis) static int zynq_gem_init(struct eth_device *dev, bd_t * bis)
{ {
u32 i; u32 i;
int ret;
unsigned long clk_rate = 0; unsigned long clk_rate = 0;
struct phy_device *phydev; struct phy_device *phydev;
struct zynq_gem_regs *regs = (struct zynq_gem_regs *)dev->iobase; struct zynq_gem_regs *regs = (struct zynq_gem_regs *)dev->iobase;
@ -384,7 +386,11 @@ static int zynq_gem_init(struct eth_device *dev, bd_t * bis)
priv->init++; priv->init++;
} }
phy_detection(dev); ret = phy_detection(dev);
if (ret) {
printf("GEM PHY init failed\n");
return ret;
}
/* interface - look at tsec */ /* interface - look at tsec */
phydev = phy_connect(priv->bus, priv->phyaddr, dev, phydev = phy_connect(priv->bus, priv->phyaddr, dev,