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

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

diff --git a/drivers/net/phy/atheros.c b/drivers/net/phy/atheros.c
index 5332e1a18f54d732f8a70148ca5a54ef780a57c0..d509e30d35901505d19966d87f0eaa06a8ea6352 100644 (file)
--- a/drivers/net/phy/atheros.c
+++ b/drivers/net/phy/atheros.c
@@ -31,9 +31,7 @@ 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);
-
-       phy_reset(phydev);
+       phydev->supported = phydev->drv->features;
 
        return 0;
 }
@@ -41,7 +39,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,
@@ -53,7 +51,7 @@ static struct phy_driver AR8031_driver =  {
        .uid = 0x4dd074,
        .mask = 0xffffffef,
        .features = PHY_GBIT_FEATURES,
-       .config = genphy_config,
+       .config = ar8021_config,
        .startup = genphy_startup,
        .shutdown = genphy_shutdown,
 };