diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-11 11:09:46 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-11 12:14:55 +0100 |
| commit | 5200678e86f76de80abbad52eb49a6a9ea8081f1 (patch) | |
| tree | ea69bf88c960f28d1ee519d042e9c583d695b7f4 /drivers/net | |
| parent | 33790253da63facab20f5ae664debba0627344df (diff) | |
| download | barebox-5200678e86f76de80abbad52eb49a6a9ea8081f1.tar.gz barebox-5200678e86f76de80abbad52eb49a6a9ea8081f1.tar.xz | |
net: phy: move phy_init_hw to phy_device_connect
This is needed when a phy gets registered outsize of phy_device_connect
but has to be attached to an ethernet device later.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/phy/mdio_bus.c | 8 | ||||
| -rw-r--r-- | drivers/net/phy/phy.c | 9 |
2 files changed, 9 insertions, 8 deletions
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index b0fbf2df36..84c05adba5 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -181,14 +181,6 @@ static int mdio_bus_probe(struct device_d *_dev) dev->supported = drv->features; dev->advertising = drv->features; - ret = phy_init_hw(dev); - if (ret) - goto err; - - /* Sanitize settings based on PHY capabilities */ - if ((dev->supported & SUPPORTED_Autoneg) == 0) - dev->autoneg = AUTONEG_DISABLE; - dev_add_param_int_ro(&dev->dev, "phy_addr", dev->addr, "%d"); dev_add_param_int_ro(&dev->dev, "phy_id", dev->phy_id, "0x%08x"); diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 74ef3d9625..b05a31390b 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -306,6 +306,15 @@ int phy_device_connect(struct eth_device *edev, struct mii_bus *bus, int addr, edev->phydev = dev; dev->attached_dev = edev; + + ret = phy_init_hw(dev); + if (ret) + goto fail; + + /* Sanitize settings based on PHY capabilities */ + if ((dev->supported & SUPPORTED_Autoneg) == 0) + dev->autoneg = AUTONEG_DISABLE; + phy_config_aneg(edev->phydev); dev->adjust_link = adjust_link; |