Merge branch 'master' of git://git.denx.de/u-boot-atmel

[oweals/u-boot.git] / drivers / net / phy / atheros.c

diff --git a/drivers/net/phy/atheros.c b/drivers/net/phy/atheros.c
index 32c2ab9944e1dfd15cf2153a55c9035d7444589c..e57c4120a3e5b4a55f2b53e110bac70a857a39b8 100644 (file)
--- a/drivers/net/phy/atheros.c
+++ b/drivers/net/phy/atheros.c
@@ -13,6 +13,7 @@ static int ar8021_config(struct phy_device *phydev)
        phy_write(phydev, MDIO_DEVAD_NONE, 0x1d, 0x05);
        phy_write(phydev, MDIO_DEVAD_NONE, 0x1e, 0x3D47);
 
+       phydev->supported = phydev->drv->features;
        return 0;
 }
 
@@ -30,9 +31,10 @@ static int ar8035_config(struct phy_device *phydev)
        regval = phy_read(phydev, MDIO_DEVAD_NONE, 0x1e);
        phy_write(phydev, MDIO_DEVAD_NONE, 0x1e, (regval|0x0100));
 
-       genphy_config_aneg(phydev);
+       phydev->supported = phydev->drv->features;
 
-       phy_reset(phydev);
+       genphy_config_aneg(phydev);
+       genphy_restart_aneg(phydev);
 
        return 0;
 }
@@ -40,7 +42,7 @@ static int ar8035_config(struct phy_device *phydev)
 static struct phy_driver AR8021_driver =  {
        .name = "AR8021",
        .uid = 0x4dd040,
-       .mask = 0x4fffff,
+       .mask = 0x4ffff0,
        .features = PHY_GBIT_FEATURES,
        .config = ar8021_config,
        .startup = genphy_startup,
@@ -52,7 +54,7 @@ static struct phy_driver AR8031_driver =  {
        .uid = 0x4dd074,
        .mask = 0xffffffef,
        .features = PHY_GBIT_FEATURES,
-       .config = ar8021_config,
+       .config = ar8035_config,
        .startup = genphy_startup,
        .shutdown = genphy_shutdown,
 };