brcm63xx: backport latest bcm63xx_enet changes from upstream

[openwrt/staging/kaloz.git] / target / linux / brcm63xx / patches-4.4 / 404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch

diff --git a/target/linux/brcm63xx/patches-4.4/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch b/target/linux/brcm63xx/patches-4.4/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch
index 7c2b686a985db2979b79a351998de6df9a37e8ff..5b754ad968bb2b9bc28074a5b0b902d8416e5bb1 100644 (file)
--- a/target/linux/brcm63xx/patches-4.4/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch
+++ b/target/linux/brcm63xx/patches-4.4/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch
@@ -100,7 +100,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
        return 0;
  }
  
-@@ -1832,6 +1791,8 @@ static int bcm_enet_probe(struct platfor
+@@ -1821,6 +1780,8 @@ static int bcm_enet_probe(struct platfor
  
        /* MII bus registration */
        if (priv->has_phy) {
@@ -109,7 +109,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  
                priv->mii_bus = mdiobus_alloc();
                if (!priv->mii_bus) {
-@@ -1869,6 +1830,38 @@ static int bcm_enet_probe(struct platfor
+@@ -1858,6 +1819,38 @@ static int bcm_enet_probe(struct platfor
                        dev_err(&pdev->dev, "unable to register mdio bus\n");
                        goto out_free_mdio;
                }
@@ -148,7 +148,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
        } else {
  
                /* run platform code to initialize PHY device */
-@@ -1914,6 +1907,9 @@ static int bcm_enet_probe(struct platfor
+@@ -1903,6 +1896,9 @@ static int bcm_enet_probe(struct platfor
        return 0;
  
  out_unregister_mdio:
@@ -158,7 +158,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
        if (priv->mii_bus)
                mdiobus_unregister(priv->mii_bus);
  
-@@ -1951,6 +1947,8 @@ static int bcm_enet_remove(struct platfo
+@@ -1940,6 +1936,8 @@ static int bcm_enet_remove(struct platfo
        enet_writel(priv, 0, ENET_MIISC_REG);
  
        if (priv->has_phy) {