summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorBo Shen <voice.shen@atmel.com>2014-11-10 07:24:01 (GMT)
committerTom Rini <trini@ti.com>2014-11-17 13:47:18 (GMT)
commitcabf61ce4b772afbc824cb27ea0407dafc06ed68 (patch)
tree592b30f0b2035f6bf12d033aec42b5178ef0a582 /drivers/net
parent7df4486d04204e654b5965267bb6c645b3c13052 (diff)
downloadu-boot-cabf61ce4b772afbc824cb27ea0407dafc06ed68.tar.xz
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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/macb.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 4616f36..9c2ff48 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);