diff options
author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-04-03 15:28:10 +0200 |
---|---|---|
committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-04-12 12:36:43 +0200 |
commit | 04c07e05a119d860b4d3b3191ff78d699aa5c209 (patch) | |
tree | 81c249a041728ae46aef05e47ea33e5fd240432f /target/linux/bcm63xx/patches-5.4/423-bcm63xx_enet_add_b53_support.patch | |
parent | f8f1dc6eab935f90b31401d87f412e3f8769dfd0 (diff) | |
download | upstream-04c07e05a119d860b4d3b3191ff78d699aa5c209.tar.gz upstream-04c07e05a119d860b4d3b3191ff78d699aa5c209.tar.bz2 upstream-04c07e05a119d860b4d3b3191ff78d699aa5c209.zip |
bcm63xx: refresh patches for kernel 5.4
Refresh patches to make them apply to kernel 5.4.
The removed patches have been merged upstream.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/bcm63xx/patches-5.4/423-bcm63xx_enet_add_b53_support.patch')
-rw-r--r-- | target/linux/bcm63xx/patches-5.4/423-bcm63xx_enet_add_b53_support.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/bcm63xx/patches-5.4/423-bcm63xx_enet_add_b53_support.patch b/target/linux/bcm63xx/patches-5.4/423-bcm63xx_enet_add_b53_support.patch index 3f093cf65c..490b59c3f8 100644 --- a/target/linux/bcm63xx/patches-5.4/423-bcm63xx_enet_add_b53_support.patch +++ b/target/linux/bcm63xx/patches-5.4/423-bcm63xx_enet_add_b53_support.patch @@ -12,7 +12,7 @@ spinlock_t enetsw_mdio_lock; --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -30,6 +30,7 @@ +@@ -17,6 +17,7 @@ #include <linux/dma-mapping.h> #include <linux/platform_device.h> #include <linux/if_vlan.h> @@ -20,7 +20,7 @@ #include <bcm63xx_dev_enet.h> #include "bcm63xx_enet.h" -@@ -1932,7 +1933,8 @@ static int bcm_enet_remove(struct platfo +@@ -1909,7 +1910,8 @@ static int bcm_enet_remove(struct platfo return 0; } @@ -30,7 +30,7 @@ .probe = bcm_enet_probe, .remove = bcm_enet_remove, .driver = { -@@ -1941,6 +1943,42 @@ struct platform_driver bcm63xx_enet_driv +@@ -1918,6 +1920,42 @@ struct platform_driver bcm63xx_enet_driv }, }; @@ -73,7 +73,7 @@ /* * switch mii access callbacks */ -@@ -2197,29 +2235,6 @@ static int bcm_enetsw_open(struct net_de +@@ -2174,29 +2212,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)); -@@ -2675,6 +2690,9 @@ static int bcm_enetsw_probe(struct platf +@@ -2652,6 +2667,9 @@ static int bcm_enetsw_probe(struct platf struct bcm63xx_enetsw_platform_data *pd; struct resource *res_mem; int ret, irq_rx, irq_tx; @@ -113,7 +113,7 @@ if (!bcm_enet_shared_base[0]) return -EPROBE_DEFER; -@@ -2755,6 +2773,43 @@ static int bcm_enetsw_probe(struct platf +@@ -2731,6 +2749,43 @@ static int bcm_enetsw_probe(struct platf priv->pdev = pdev; priv->net_dev = dev; @@ -157,7 +157,7 @@ return 0; out_disable_clk: -@@ -2776,6 +2831,9 @@ static int bcm_enetsw_remove(struct plat +@@ -2752,6 +2807,9 @@ static int bcm_enetsw_remove(struct plat priv = netdev_priv(dev); unregister_netdev(dev); |