diff options
author | Jonas Gorski <jonas.gorski@gmail.com> | 2017-10-02 11:41:43 +0200 |
---|---|---|
committer | Jonas Gorski <jonas.gorski@gmail.com> | 2017-12-16 12:57:05 +0100 |
commit | 49c3b1c4555db688c4c514d1284254f954e46180 (patch) | |
tree | 4e8bb279e592509354f071118ebfb24a3690d7bb /target/linux/brcm63xx/patches-4.4/423-bcm63xx_enet_add_b53_support.patch | |
parent | aba4e29eadfb82ef7f52f85cdb4cd10a4abad622 (diff) | |
download | upstream-49c3b1c4555db688c4c514d1284254f954e46180.tar.gz upstream-49c3b1c4555db688c4c514d1284254f954e46180.tar.bz2 upstream-49c3b1c4555db688c4c514d1284254f954e46180.zip |
brcm63xx: backport enet cleanup patches
Align with upstream version, mostly non-fixes and small clean ups.
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Diffstat (limited to 'target/linux/brcm63xx/patches-4.4/423-bcm63xx_enet_add_b53_support.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-4.4/423-bcm63xx_enet_add_b53_support.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/target/linux/brcm63xx/patches-4.4/423-bcm63xx_enet_add_b53_support.patch b/target/linux/brcm63xx/patches-4.4/423-bcm63xx_enet_add_b53_support.patch index 19d7905114..b498edf028 100644 --- a/target/linux/brcm63xx/patches-4.4/423-bcm63xx_enet_add_b53_support.patch +++ b/target/linux/brcm63xx/patches-4.4/423-bcm63xx_enet_add_b53_support.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.h +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.h -@@ -336,6 +336,9 @@ struct bcm_enet_priv { +@@ -335,6 +335,9 @@ struct bcm_enet_priv { struct bcm63xx_enetsw_port used_ports[ENETSW_MAX_PORT]; int sw_port_link[ENETSW_MAX_PORT]; @@ -20,7 +20,7 @@ #include <bcm63xx_dev_enet.h> #include "bcm63xx_enet.h" -@@ -1974,7 +1975,8 @@ static int bcm_enet_remove(struct platfo +@@ -1969,7 +1970,8 @@ static int bcm_enet_remove(struct platfo return 0; } @@ -30,7 +30,7 @@ .probe = bcm_enet_probe, .remove = bcm_enet_remove, .driver = { -@@ -1983,6 +1985,42 @@ struct platform_driver bcm63xx_enet_driv +@@ -1978,6 +1980,42 @@ struct platform_driver bcm63xx_enet_driv }, }; @@ -73,7 +73,7 @@ /* * switch mii access callbacks */ -@@ -2241,29 +2279,6 @@ static int bcm_enetsw_open(struct net_de +@@ -2236,29 +2274,6 @@ static int bcm_enetsw_open(struct net_de enetsw_writeb(priv, rgmii_ctrl, ENETSW_RGMII_CTRL_REG(i)); } @@ -103,7 +103,7 @@ /* initialize flow control buffer allocation */ enet_dma_writel(priv, ENETDMA_BUFALLOC_FORCE_MASK | 0, ENETDMA_BUFALLOC_REG(priv->rx_chan)); -@@ -2722,6 +2737,9 @@ static int bcm_enetsw_probe(struct platf +@@ -2717,6 +2732,9 @@ static int bcm_enetsw_probe(struct platf struct bcm63xx_enetsw_platform_data *pd; struct resource *res_mem; int ret, irq_rx, irq_tx; @@ -111,9 +111,9 @@ + u16 port_mask = BIT(8); + u8 val; - /* stop if shared driver failed, assume driver->probe will be - * called in the same order we register devices (correct ?) -@@ -2811,6 +2829,43 @@ static int bcm_enetsw_probe(struct platf + if (!bcm_enet_shared_base[0]) + return -EPROBE_DEFER; +@@ -2799,6 +2817,43 @@ static int bcm_enetsw_probe(struct platf priv->pdev = pdev; priv->net_dev = dev; @@ -156,14 +156,14 @@ + return 0; - out_put_clk: -@@ -2839,6 +2894,9 @@ static int bcm_enetsw_remove(struct plat + out_disable_clk: +@@ -2820,6 +2875,9 @@ static int bcm_enetsw_remove(struct plat priv = netdev_priv(dev); unregister_netdev(dev); + /* remove switch */ + bcmenet_switch_unregister(priv); + - /* release device resources */ - iounmap(priv->base); - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + clk_disable_unprepare(priv->mac_clk); + + free_netdev(dev); |