diff options
| author | Stefano Babic <sbabic@denx.de> | 2012-02-22 00:24:35 +0000 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-05-15 08:31:30 +0200 |
| commit | b774fe9d8a3047293867267ca60355cf14f8268d (patch) | |
| tree | afcc628a03145138df973e72f228139e0d4521e5 | |
| parent | 4a9677e53f609d7f1043dde12b6c15c37baa579f (diff) | |
| download | talos-obmc-uboot-b774fe9d8a3047293867267ca60355cf14f8268d.tar.gz talos-obmc-uboot-b774fe9d8a3047293867267ca60355cf14f8268d.zip | |
NET: fec_mxc.c: Add a way to disable auto negotiation
Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Fabio Estevam <fabio.estevam@freescale.com>
| -rw-r--r-- | drivers/net/fec_mxc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index d8db9f0c6e..5c3b90fe00 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -187,9 +187,10 @@ int fec_phy_write(struct mii_dev *bus, int phyAddr, int dev_addr, int regAddr, #ifndef CONFIG_PHYLIB static int miiphy_restart_aneg(struct eth_device *dev) { + int ret = 0; +#if !defined(CONFIG_FEC_MXC_NO_ANEG) struct fec_priv *fec = (struct fec_priv *)dev->priv; struct ethernet_regs *eth = fec->bus->priv; - int ret = 0; /* * Wake up from sleep if necessary @@ -213,6 +214,7 @@ static int miiphy_restart_aneg(struct eth_device *dev) if (fec->mii_postcall) ret = fec->mii_postcall(fec->phy_id); +#endif return ret; } |
