diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-07-30 20:39:52 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-07-30 20:39:52 +0200 |
| commit | b98b611502f5e0a85a1f8e15cf46c470cb105614 (patch) | |
| tree | cafae797ef1f031088e7a988d8e1eaa36ea016a3 /drivers/net/xilinx_ll_temac.c | |
| parent | 190649fb4309d1bc0fe7732fd0f951cb6440f935 (diff) | |
| parent | 15ae8a31ca5d3860b0957edec4fca373daff6bb5 (diff) | |
| download | u-boot-imx-b98b611502f5e0a85a1f8e15cf46c470cb105614.zip u-boot-imx-b98b611502f5e0a85a1f8e15cf46c470cb105614.tar.gz u-boot-imx-b98b611502f5e0a85a1f8e15cf46c470cb105614.tar.bz2 | |
Merge branch 'next' of git://git.denx.de/u-boot
* 'next' of git://git.denx.de/u-boot:
MPC8xx: Fixup warning in arch/powerpc/cpu/mpc8xx/cpu.c
doc: cleanup - move board READMEs into respective board directories
net: sh_eth: add support for SH7757's GETHER
net: sh_eth: modify the definitions of regsiter
net: sh_eth: add SH_ETH_TYPE_ condition
net: sh_eth: clean up for the SH7757's code
net: fec_mxc: Fix MDC for xMII
net: fec_mxc: Fix setting of RCR for xMII
net: nfs: make NFS_TIMEOUT configurable
net: Inline the new eth_setenv_enetaddr_by_index function
net: allow setting env enetaddr from net device setting
net/designware: Consecutive writes to the same register to be avoided
CACHE: net: asix: Fix asix driver to work with data cache on
net: phy: micrel: make ksz9021 phy accessible
net: abort network initialization if the PHY driver fails
phylib: phy_startup() should return an error code on failure
net: tftp: fix type of block arg to store_block
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'drivers/net/xilinx_ll_temac.c')
| -rw-r--r-- | drivers/net/xilinx_ll_temac.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/xilinx_ll_temac.c b/drivers/net/xilinx_ll_temac.c index 27dafc1..b67153b 100644 --- a/drivers/net/xilinx_ll_temac.c +++ b/drivers/net/xilinx_ll_temac.c @@ -232,6 +232,7 @@ static void ll_temac_halt(struct eth_device *dev) static int ll_temac_init(struct eth_device *dev, bd_t *bis) { struct ll_temac *ll_temac = dev->priv; + int ret; printf("%s: Xilinx XPS LocalLink Tri-Mode Ether MAC #%d at 0x%08X.\n", dev->name, dev->index, dev->iobase); @@ -240,7 +241,12 @@ static int ll_temac_init(struct eth_device *dev, bd_t *bis) return -1; /* Start up the PHY */ - phy_startup(ll_temac->phydev); + ret = phy_startup(ll_temac->phydev); + if (ret) { + printf("%s: Could not initialize PHY %s\n", + dev->name, ll_temac->phydev->dev->name); + return ret; + } if (!ll_temac_adjust_link(dev)) { ll_temac_halt(dev); |