kernel: bump 5.10 to 5.10.106

[openwrt/staging/mkresin.git] / target / linux / at91 / patches-5.10 / 115-net-macb-add-userio-bits-as-platform-configuration.patch

diff --git a/target/linux/at91/patches-5.10/115-net-macb-add-userio-bits-as-platform-configuration.patch b/target/linux/at91/patches-5.10/115-net-macb-add-userio-bits-as-platform-configuration.patch
index 45b4382cf3ca1081a8a90ece1e93d3d8d7e0af06..6336c92d1f92d01ce08b03fa1301320bc647ea4c 100644 (file)
--- a/target/linux/at91/patches-5.10/115-net-macb-add-userio-bits-as-platform-configuration.patch
+++ b/target/linux/at91/patches-5.10/115-net-macb-add-userio-bits-as-platform-configuration.patch
@@ -49,7 +49,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  #ifdef CONFIG_MACB_USE_HWSTAMP
 --- a/drivers/net/ethernet/cadence/macb_main.c
 +++ b/drivers/net/ethernet/cadence/macb_main.c
-@@ -3800,15 +3800,15 @@ static int macb_init(struct platform_dev
+@@ -3823,15 +3823,15 @@ static int macb_init(struct platform_dev
        if (!(bp->caps & MACB_CAPS_USRIO_DISABLED)) {
                val = 0;
                if (phy_interface_mode_is_rgmii(bp->phy_interface))
@@ -69,7 +69,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
                macb_or_gem_writel(bp, USRIO, val);
        }
-@@ -4326,6 +4326,13 @@ static int fu540_c000_init(struct platfo
+@@ -4349,6 +4349,13 @@ static int fu540_c000_init(struct platfo
        return macb_init(pdev);
  }
  
@@ -83,7 +83,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static const struct macb_config fu540_c000_config = {
        .caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE | MACB_CAPS_JUMBO |
                MACB_CAPS_GEM_HAS_PTP,
-@@ -4333,12 +4340,14 @@ static const struct macb_config fu540_c0
+@@ -4356,12 +4363,14 @@ static const struct macb_config fu540_c0
        .clk_init = fu540_c000_clk_init,
        .init = fu540_c000_init,
        .jumbo_max_len = 10240,
@@ -98,7 +98,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  static const struct macb_config sama5d3macb_config = {
-@@ -4346,6 +4355,7 @@ static const struct macb_config sama5d3m
+@@ -4369,6 +4378,7 @@ static const struct macb_config sama5d3m
              | MACB_CAPS_USRIO_HAS_CLKEN | MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII,
        .clk_init = macb_clk_init,
        .init = macb_init,
@@ -106,7 +106,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  static const struct macb_config pc302gem_config = {
-@@ -4353,6 +4363,7 @@ static const struct macb_config pc302gem
+@@ -4376,6 +4386,7 @@ static const struct macb_config pc302gem
        .dma_burst_length = 16,
        .clk_init = macb_clk_init,
        .init = macb_init,
@@ -114,7 +114,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  static const struct macb_config sama5d2_config = {
-@@ -4360,6 +4371,7 @@ static const struct macb_config sama5d2_
+@@ -4383,6 +4394,7 @@ static const struct macb_config sama5d2_
        .dma_burst_length = 16,
        .clk_init = macb_clk_init,
        .init = macb_init,
@@ -122,7 +122,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  static const struct macb_config sama5d3_config = {
-@@ -4369,6 +4381,7 @@ static const struct macb_config sama5d3_
+@@ -4392,6 +4404,7 @@ static const struct macb_config sama5d3_
        .clk_init = macb_clk_init,
        .init = macb_init,
        .jumbo_max_len = 10240,
@@ -130,7 +130,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  static const struct macb_config sama5d4_config = {
-@@ -4376,18 +4389,21 @@ static const struct macb_config sama5d4_
+@@ -4399,18 +4412,21 @@ static const struct macb_config sama5d4_
        .dma_burst_length = 4,
        .clk_init = macb_clk_init,
        .init = macb_init,
@@ -152,7 +152,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  static const struct macb_config zynqmp_config = {
-@@ -4398,6 +4414,7 @@ static const struct macb_config zynqmp_c
+@@ -4421,6 +4437,7 @@ static const struct macb_config zynqmp_c
        .clk_init = macb_clk_init,
        .init = macb_init,
        .jumbo_max_len = 10240,
@@ -160,7 +160,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  static const struct macb_config zynq_config = {
-@@ -4406,6 +4423,7 @@ static const struct macb_config zynq_con
+@@ -4429,6 +4446,7 @@ static const struct macb_config zynq_con
        .dma_burst_length = 16,
        .clk_init = macb_clk_init,
        .init = macb_init,
@@ -168,7 +168,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  static const struct of_device_id macb_dt_ids[] = {
-@@ -4526,6 +4544,8 @@ static int macb_probe(struct platform_de
+@@ -4549,6 +4567,8 @@ static int macb_probe(struct platform_de
                bp->wol |= MACB_WOL_HAS_MAGIC_PACKET;
        device_set_wakeup_capable(&pdev->dev, bp->wol & MACB_WOL_HAS_MAGIC_PACKET);