net: ethernet: Fix up drivers masking pause support

[linux.git] / drivers / net / ethernet / mediatek / mtk_eth_soc.c

diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 6e6abdc399deb3c1dc4662faa082e170e2a212f6..db231bda7c2aa324f635ad77771736fb9ee9346e 100644 (file)
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -359,8 +359,8 @@ static int mtk_phy_connect(struct net_device *dev)
                dev->phydev->supported |=
                SUPPORTED_Pause | SUPPORTED_Asym_Pause;
 
-       dev->phydev->supported &= PHY_GBIT_FEATURES | SUPPORTED_Pause |
-                                  SUPPORTED_Asym_Pause;
+       phy_set_max_speed(dev->phydev, SPEED_1000);
+       dev->phydev->supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause;
        dev->phydev->advertising = dev->phydev->supported |
                                    ADVERTISED_Autoneg;
        phy_start_aneg(dev->phydev);
@@ -405,7 +405,7 @@ static int mtk_mdio_init(struct mtk_eth *eth)
        eth->mii_bus->priv = eth;
        eth->mii_bus->parent = eth->dev;
 
-       snprintf(eth->mii_bus->id, MII_BUS_ID_SIZE, "%s", mii_np->name);
+       snprintf(eth->mii_bus->id, MII_BUS_ID_SIZE, "%pOFn", mii_np);
        ret = of_mdiobus_register(eth->mii_bus, mii_np);
 
 err_put_node: