diff options
| author | Jonas Gorski <jonas.gorski@gmail.com> | 2017-12-17 14:15:29 +0100 |
|---|---|---|
| committer | Jonas Gorski <jonas.gorski@gmail.com> | 2018-02-11 23:15:05 +0100 |
| commit | a41ad1b6f60bdd95c12fbe8ca2d84692360d73d6 (patch) | |
| tree | 89f2e50df8b9a2e61cc9a624230f1142058ac494 /target/linux/brcm63xx/patches-4.4/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch | |
| parent | 457e7a160a31d6c8c4bfe0c3e309b30e0d3132f3 (diff) | |
| download | mtk-20170518-a41ad1b6f60bdd95c12fbe8ca2d84692360d73d6.zip mtk-20170518-a41ad1b6f60bdd95c12fbe8ca2d84692360d73d6.tar.gz mtk-20170518-a41ad1b6f60bdd95c12fbe8ca2d84692360d73d6.tar.bz2 | |
brcm63xx: backport latest bcm63xx_enet changes from upstream
No functional changes, just simple cleanups.
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Diffstat (limited to 'target/linux/brcm63xx/patches-4.4/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-4.4/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch | 8 |
1 files changed, 4 insertions, 4 deletions
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 7c2b686..5b754ad 100644 --- 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) { |