1 files changed, 20 insertions, 9 deletions

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 2a08b2b62c4c..b01fc70a57db 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -59,6 +59,7 @@ struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
         dev->duplex = -1;
         dev->pause = dev->asym_pause = 0;
         dev->link = 1;
+        dev->interface = PHY_INTERFACE_MODE_GMII;
 
         dev->autoneg = AUTONEG_ENABLE;
 
@@ -137,11 +138,12 @@ void phy_prepare_link(struct phy_device *phydev,
  *   the desired functionality.
  */
 struct phy_device * phy_connect(struct net_device *dev, const char *phy_id,
-                void (*handler)(struct net_device *), u32 flags)
+                void (*handler)(struct net_device *), u32 flags,
+                u32 interface)
 {
         struct phy_device *phydev;
 
-        phydev = phy_attach(dev, phy_id, flags);
+        phydev = phy_attach(dev, phy_id, flags, interface);
 
         if (IS_ERR(phydev))
                 return phydev;
@@ -186,7 +188,7 @@ static int phy_compare_id(struct device *dev, void *data)
 }
 
 struct phy_device *phy_attach(struct net_device *dev,
-                const char *phy_id, u32 flags)
+                const char *phy_id, u32 flags, u32 interface)
 {
         struct bus_type *bus = &mdio_bus_type;
         struct phy_device *phydev;
@@ -231,6 +233,20 @@ struct phy_device *phy_attach(struct net_device *dev,
 
         phydev->dev_flags = flags;
 
+        phydev->interface = interface;
+
+        /* Do initial configuration here, now that
+         * we have certain key parameters
+         * (dev_flags and interface) */
+        if (phydev->drv->config_init) {
+                int err;
+
+                err = phydev->drv->config_init(phydev);
+
+                if (err < 0)
+                        return ERR_PTR(err);
+        }
+
         return phydev;
 }
 EXPORT_SYMBOL(phy_attach);
@@ -612,13 +628,8 @@ static int phy_probe(struct device *dev)
 
         spin_unlock(&phydev->lock);
 
-        if (err < 0)
-                return err;
-
-        if (phydev->drv->config_init)
-                err = phydev->drv->config_init(phydev);
-
         return err;
+
 }
 
 static int phy_remove(struct device *dev)