kernel: bump 5.10 to 5.10.178

[openwrt/staging/dedeckeh.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 ce5a2ebc40e4bff5781a7a113b1b9065c335730a..e474590053fc3166c7c24ffc22add95cd7cf761f 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
@@ -14,8 +14,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  drivers/net/ethernet/cadence/macb_main.c | 28 ++++++++++++++++++++----
  2 files changed, 34 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h
-index 5de47f6fde5a..e9385a1390a9 100644
 --- a/drivers/net/ethernet/cadence/macb.h
 +++ b/drivers/net/ethernet/cadence/macb.h
 @@ -1104,6 +1104,14 @@ struct macb_pm_data {
@@ -49,11 +47,9 @@ index 5de47f6fde5a..e9385a1390a9 100644
  };
  
  #ifdef CONFIG_MACB_USE_HWSTAMP
-diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
-index 1e8bf6b9834b..a8326b75eca8 100644
 --- 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_device *pdev)
+@@ -3828,15 +3828,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))
@@ -73,7 +69,7 @@ index 1e8bf6b9834b..a8326b75eca8 100644
  
                macb_or_gem_writel(bp, USRIO, val);
        }
-@@ -4326,6 +4326,13 @@ static int fu540_c000_init(struct platform_device *pdev)
+@@ -4354,6 +4354,13 @@ static int fu540_c000_init(struct platfo
        return macb_init(pdev);
  }
  
@@ -87,7 +83,7 @@ index 1e8bf6b9834b..a8326b75eca8 100644
  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_c000_config = {
+@@ -4361,12 +4368,14 @@ static const struct macb_config fu540_c0
        .clk_init = fu540_c000_clk_init,
        .init = fu540_c000_init,
        .jumbo_max_len = 10240,
@@ -102,7 +98,7 @@ index 1e8bf6b9834b..a8326b75eca8 100644
  };
  
  static const struct macb_config sama5d3macb_config = {
-@@ -4346,6 +4355,7 @@ static const struct macb_config sama5d3macb_config = {
+@@ -4374,6 +4383,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,
@@ -110,7 +106,7 @@ index 1e8bf6b9834b..a8326b75eca8 100644
  };
  
  static const struct macb_config pc302gem_config = {
-@@ -4353,6 +4363,7 @@ static const struct macb_config pc302gem_config = {
+@@ -4381,6 +4391,7 @@ static const struct macb_config pc302gem
        .dma_burst_length = 16,
        .clk_init = macb_clk_init,
        .init = macb_init,
@@ -118,7 +114,7 @@ index 1e8bf6b9834b..a8326b75eca8 100644
  };
  
  static const struct macb_config sama5d2_config = {
-@@ -4360,6 +4371,7 @@ static const struct macb_config sama5d2_config = {
+@@ -4388,6 +4399,7 @@ static const struct macb_config sama5d2_
        .dma_burst_length = 16,
        .clk_init = macb_clk_init,
        .init = macb_init,
@@ -126,7 +122,7 @@ index 1e8bf6b9834b..a8326b75eca8 100644
  };
  
  static const struct macb_config sama5d3_config = {
-@@ -4369,6 +4381,7 @@ static const struct macb_config sama5d3_config = {
+@@ -4397,6 +4409,7 @@ static const struct macb_config sama5d3_
        .clk_init = macb_clk_init,
        .init = macb_init,
        .jumbo_max_len = 10240,
@@ -134,7 +130,7 @@ index 1e8bf6b9834b..a8326b75eca8 100644
  };
  
  static const struct macb_config sama5d4_config = {
-@@ -4376,18 +4389,21 @@ static const struct macb_config sama5d4_config = {
+@@ -4404,18 +4417,21 @@ static const struct macb_config sama5d4_
        .dma_burst_length = 4,
        .clk_init = macb_clk_init,
        .init = macb_init,
@@ -156,7 +152,7 @@ index 1e8bf6b9834b..a8326b75eca8 100644
  };
  
  static const struct macb_config zynqmp_config = {
-@@ -4398,6 +4414,7 @@ static const struct macb_config zynqmp_config = {
+@@ -4426,6 +4442,7 @@ static const struct macb_config zynqmp_c
        .clk_init = macb_clk_init,
        .init = macb_init,
        .jumbo_max_len = 10240,
@@ -164,7 +160,7 @@ index 1e8bf6b9834b..a8326b75eca8 100644
  };
  
  static const struct macb_config zynq_config = {
-@@ -4406,6 +4423,7 @@ static const struct macb_config zynq_config = {
+@@ -4434,6 +4451,7 @@ static const struct macb_config zynq_con
        .dma_burst_length = 16,
        .clk_init = macb_clk_init,
        .init = macb_init,
@@ -172,7 +168,7 @@ index 1e8bf6b9834b..a8326b75eca8 100644
  };
  
  static const struct of_device_id macb_dt_ids[] = {
-@@ -4527,6 +4545,8 @@ static int macb_probe(struct platform_device *pdev)
+@@ -4554,6 +4572,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);
  
@@ -181,6 +177,3 @@ index 1e8bf6b9834b..a8326b75eca8 100644
        spin_lock_init(&bp->lock);
  
        /* setup capabilities */
--- 
-2.32.0
-