Revert "net: macb: Fixed reading MII_LPA register"
authorBin Meng <bmeng.cn@gmail.com>
Wed, 14 Aug 2019 10:29:42 +0000 (03:29 -0700)
committerJoe Hershberger <joe.hershberger@ni.com>
Wed, 4 Sep 2019 16:37:19 +0000 (11:37 -0500)
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>
drivers/net/macb.c

index c99cf663a4162d3fdfa50f1b6ec13a30e1b2aedc..25f79136e0fc428c751e575fc6e685a390c427da 100644 (file)
@@ -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)) {