kernel: bump 4.14 to 4.14.155

[oweals/openwrt.git] / target / linux / brcm63xx / patches-4.14 / 423-bcm63xx_enet_add_b53_support.patch

diff --git a/target/linux/brcm63xx/patches-4.14/423-bcm63xx_enet_add_b53_support.patch b/target/linux/brcm63xx/patches-4.14/423-bcm63xx_enet_add_b53_support.patch
index ba2a8f93ddb4f0f3fe2c5ed61e14f6d03d68f157..58f1b13d38e61816af77a882d61b2c4e398b4266 100644 (file)
--- a/target/linux/brcm63xx/patches-4.14/423-bcm63xx_enet_add_b53_support.patch
+++ b/target/linux/brcm63xx/patches-4.14/423-bcm63xx_enet_add_b53_support.patch
@@ -20,7 +20,7 @@
  
  #include <bcm63xx_dev_enet.h>
  #include "bcm63xx_enet.h"
-@@ -1936,7 +1937,8 @@ static int bcm_enet_remove(struct platfo
+@@ -1937,7 +1938,8 @@ static int bcm_enet_remove(struct platfo
        return 0;
  }
  
@@ -30,7 +30,7 @@
        .probe  = bcm_enet_probe,
        .remove = bcm_enet_remove,
        .driver = {
-@@ -1945,6 +1947,42 @@ struct platform_driver bcm63xx_enet_driv
+@@ -1946,6 +1948,42 @@ struct platform_driver bcm63xx_enet_driv
        },
  };
  
@@ -73,7 +73,7 @@
  /*
   * switch mii access callbacks
   */
-@@ -2203,29 +2241,6 @@ static int bcm_enetsw_open(struct net_de
+@@ -2204,29 +2242,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));
-@@ -2684,6 +2699,9 @@ static int bcm_enetsw_probe(struct platf
+@@ -2685,6 +2700,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;
-@@ -2766,6 +2784,43 @@ static int bcm_enetsw_probe(struct platf
+@@ -2767,6 +2785,43 @@ static int bcm_enetsw_probe(struct platf
        priv->pdev = pdev;
        priv->net_dev = dev;
  
@@ -157,7 +157,7 @@
        return 0;
  
  out_disable_clk:
-@@ -2787,6 +2842,9 @@ static int bcm_enetsw_remove(struct plat
+@@ -2788,6 +2843,9 @@ static int bcm_enetsw_remove(struct plat
        priv = netdev_priv(dev);
        unregister_netdev(dev);