From: Stefano Babic <sbabic@denx.de>
Date: Wed, 22 Feb 2012 00:24:35 +0000 (+0000)
Subject: NET: fec_mxc.c: Add a way to disable auto negotiation
X-Git-Tag: v2012.07-rc1~144^2~100
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b774fe9d8a3047293867267ca60355cf14f8268d;p=u-boot

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>
---

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;
 }