From: Bin Meng <bmeng.cn@gmail.com>
Date: Wed, 14 Aug 2019 10:29:42 +0000 (-0700)
Subject: Revert "net: macb: Fixed reading MII_LPA register"
X-Git-Tag: v2019.10-rc4~22^2~11
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=19f3b78dfbc63c46574e1c2232a8a89fc122405f;p=oweals%2Fu-boot.git

Revert "net: macb: Fixed reading MII_LPA register"

This reverts commit 1b0c9914cc75d1570359181ebd493cd5746cb0ed.

Commit 1b0c9914cc75 ("net: macb: Fixed reading MII_LPA register")
causes 100Mbps does not work any more with SiFive FU540 GEM on the
HiFive Unleashed board. Revert it.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
---

diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index c99cf663a4..25f79136e0 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -643,7 +643,7 @@ static int macb_phy_init(struct macb_device *macb, const char *name)
 
 	/* First check for GMAC and that it is GiB capable */
 	if (gem_is_gigabit_capable(macb)) {
-		lpa = macb_mdio_read(macb, MII_LPA);
+		lpa = macb_mdio_read(macb, MII_STAT1000);
 
 		if (lpa & (LPA_1000FULL | LPA_1000HALF | LPA_1000XFULL |
 					LPA_1000XHALF)) {