[linux-yocto] [PATCH 040/161] drivers/net: adding ifdef for Amarillo, without the auto-negotiate ecn.

[Cristian Bercaru]

From: Paul Butler <paul.butler at windriver.com>

Signed-off-by: Paul Butler <paul.butler at windriver.com>
---
 drivers/net/ethernet/lsi/lsi_acp_net.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/lsi/lsi_acp_net.c b/drivers/net/ethernet/lsi/lsi_acp_net.c
index 1753efd..5244040 100644
--- a/drivers/net/ethernet/lsi/lsi_acp_net.c
+++ b/drivers/net/ethernet/lsi/lsi_acp_net.c
@@ -275,9 +275,9 @@ skip_first:
 		return ret;
 	}
 
-#ifdef CONFIG_ARCH_AXXIA
+#ifdef AMARILLO_WA
 	/*
-	 * For the Axxia AXM, set RX FIFO size to 0x7.
+	 * For Amarillo, without the auto-negotiate ecn.
 	 */
 	{
 		u16 val;
@@ -298,6 +298,9 @@ skip_first:
 		rc |= acp_mdio_read(phydev->addr, PHY_BCM_TEST_REG, &val);
 		val &= ~0x80;
 		rc |= acp_mdio_write(phydev->addr, PHY_BCM_TEST_REG, val);
+
+		if (0 != rc)
+			return -EIO;
 	}
 #endif
 	netdev_info(dev,
-- 
1.7.9.5