X-Git-Url: https://git.kernelconcepts.de/?a=blobdiff_plain;f=drivers%2Fnet%2Fmacb.c;h=82e80cf5640d26a253d677bdbc0ec6ade4973d71;hb=2c3129df34ba163520b18b07104bf3803595a440;hp=9c2ff487a709f57eae7caa6df51a8dce7292f2cd;hpb=fc9b0b80435cda721fbdbe507c9e4f388b0ea62b;p=karo-tx-uboot.git

diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 9c2ff487a7..82e80cf564 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -347,14 +347,14 @@ static int macb_recv(struct eth_device *netdev)
 				headlen = 128 * (MACB_RX_RING_SIZE
 						 - macb->rx_tail);
 				taillen = length - headlen;
-				memcpy((void *)NetRxPackets[0],
+				memcpy((void *)net_rx_packets[0],
 				       buffer, headlen);
-				memcpy((void *)NetRxPackets[0] + headlen,
+				memcpy((void *)net_rx_packets[0] + headlen,
 				       macb->rx_buffer, taillen);
-				buffer = (void *)NetRxPackets[0];
+				buffer = (void *)net_rx_packets[0];
 			}
 
-			NetReceive(buffer, length);
+			net_process_received_packet(buffer, length);
 			if (++rx_tail >= MACB_RX_RING_SIZE)
 				rx_tail = 0;
 			reclaim_rx_buffers(macb, rx_tail);
@@ -419,6 +419,15 @@ static int macb_phy_find(struct macb_device *macb)
 }
 #endif /* CONFIG_MACB_SEARCH_PHY */
 
+#ifdef CONFIG_PHYLIB
+#define gbit_phy_support(p)	((p)->supported &			\
+					(SUPPORTED_1000baseT_Full |	\
+					SUPPORTED_1000baseT_Half))
+#elif defined(CONFIG_RGMII) || defined(CONFIG_GMII)
+#define gbit_phy_support(p)	1
+#else
+#define gbit_phy_support(p)	0
+#endif
 
 static int macb_phy_init(struct macb_device *macb)
 {
@@ -478,26 +487,28 @@ static int macb_phy_init(struct macb_device *macb)
 
 	/* First check for GMAC */
 	if (macb_is_gem(macb)) {
-		lpa = macb_mdio_read(macb, MII_STAT1000);
+		if (gbit_phy_support(phydev)) {
+			lpa = macb_mdio_read(macb, MII_STAT1000);
 
-		if (lpa & (LPA_1000FULL | LPA_1000HALF)) {
-			duplex = ((lpa & LPA_1000FULL) ? 1 : 0);
+			if (lpa & (LPA_1000FULL | LPA_1000HALF)) {
+				duplex = ((lpa & LPA_1000FULL) ? 1 : 0);
 
-			printf("%s: link up, 1000Mbps %s-duplex (lpa: 0x%04x)\n",
-			       netdev->name,
-			       duplex ? "full" : "half",
-			       lpa);
+				printf("%s: link up, 1000Mbps %s-duplex (lpa: 0x%04x)\n",
+					netdev->name,
+					duplex ? "full" : "half",
+					lpa);
 
-			ncfgr = macb_readl(macb, NCFGR);
-			ncfgr &= ~(MACB_BIT(SPD) | MACB_BIT(FD));
-			ncfgr |= GEM_BIT(GBE);
+				ncfgr = macb_readl(macb, NCFGR);
+				ncfgr &= ~(MACB_BIT(SPD) | MACB_BIT(FD));
+				ncfgr |= GEM_BIT(GBE);
 
-			if (duplex)
-				ncfgr |= MACB_BIT(FD);
+				if (duplex)
+					ncfgr |= MACB_BIT(FD);
 
-			macb_writel(macb, NCFGR, ncfgr);
+				macb_writel(macb, NCFGR, ncfgr);
 
-			return 1;
+				return 1;
+			}
 		}
 	}
 
@@ -515,7 +526,7 @@ static int macb_phy_init(struct macb_device *macb)
 	       lpa);
 
 	ncfgr = macb_readl(macb, NCFGR);
-	ncfgr &= ~(MACB_BIT(SPD) | MACB_BIT(FD));
+	ncfgr &= ~(MACB_BIT(SPD) | MACB_BIT(FD) | GEM_BIT(GBE));
 	if (speed)
 		ncfgr |= MACB_BIT(SPD);
 	if (duplex)
@@ -525,7 +536,6 @@ static int macb_phy_init(struct macb_device *macb)
 	return 1;
 }
 
-static int macb_write_hwaddr(struct eth_device *dev);
 static int macb_init(struct eth_device *netdev, bd_t *bd)
 {
 	struct macb_device *macb = to_macb(netdev);
@@ -594,14 +604,6 @@ static int macb_init(struct eth_device *netdev, bd_t *bd)
 #endif /* CONFIG_RMII */
 	}
 
-	/* update the ethaddr */
-	if (is_valid_ether_addr(netdev->enetaddr)) {
-		macb_write_hwaddr(netdev);
-	} else {
-		printf("%s: mac address is not valid\n", netdev->name);
-		return -1;
-	}
-
 	if (!macb_phy_init(macb))
 		return -1;