From: Bo Shen <voice.shen@atmel.com>
Date: Mon, 10 Nov 2014 07:24:01 +0000 (+0800)
Subject: net: macb: enable GMAC IP without GE feature support
X-Git-Tag: v2015.01-rc2~56
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cabf61ce4b772afbc824cb27ea0407dafc06ed68;p=u-boot

net: macb: enable GMAC IP without GE feature support

The User Register in GMAC IP is used to select interface type.
When with GE feature, it is used to select interface between
RGMII and GMII. If without GE feature, it is used to select
interface between MII and RMII.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
---

diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 4616f369ca..9c2ff487a7 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -566,7 +566,13 @@ static int macb_init(struct eth_device *netdev, bd_t *bd)
 	macb_writel(macb, TBQP, macb->tx_ring_dma);
 
 	if (macb_is_gem(macb)) {
-#ifdef CONFIG_RGMII
+		/*
+		 * When the GMAC IP with GE feature, this bit is used to
+		 * select interface between RGMII and GMII.
+		 * When the GMAC IP without GE feature, this bit is used
+		 * to select interface between RMII and MII.
+		 */
+#if defined(CONFIG_RGMII) || defined(CONFIG_RMII)
 		gem_writel(macb, UR, GEM_BIT(RGMII));
 #else
 		gem_writel(macb, UR, 0);