kernel: bump 5.15 to 5.15.47

[openwrt/openwrt.git] / target / linux / generic / backport-5.15 / 702-v5.19-19-net-ethernet-mtk_eth_soc-add-txd_size-to-mtk_soc_dat.patch

diff --git a/target/linux/generic/backport-5.15/702-v5.19-19-net-ethernet-mtk_eth_soc-add-txd_size-to-mtk_soc_dat.patch b/target/linux/generic/backport-5.15/702-v5.19-19-net-ethernet-mtk_eth_soc-add-txd_size-to-mtk_soc_dat.patch
index d40d1776383fdebb93557812691cc86898379e5c..b7b5e7c5bb8f385cdc27e9f02d1de24f13958523 100644 (file)
--- a/target/linux/generic/backport-5.15/702-v5.19-19-net-ethernet-mtk_eth_soc-add-txd_size-to-mtk_soc_dat.patch
+++ b/target/linux/generic/backport-5.15/702-v5.19-19-net-ethernet-mtk_eth_soc-add-txd_size-to-mtk_soc_dat.patch
@@ -65,7 +65,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        }
  
        mtk_w32(eth, eth->phy_scratch_ring, MTK_QDMA_FQ_HEAD);
-@@ -2149,6 +2152,7 @@ static int mtk_dma_init(struct mtk_eth *
+@@ -2152,6 +2155,7 @@ static int mtk_dma_init(struct mtk_eth *
  
  static void mtk_dma_free(struct mtk_eth *eth)
  {
@@ -73,7 +73,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        int i;
  
        for (i = 0; i < MTK_MAC_COUNT; i++)
-@@ -2156,9 +2160,8 @@ static void mtk_dma_free(struct mtk_eth
+@@ -2159,9 +2163,8 @@ static void mtk_dma_free(struct mtk_eth
                        netdev_reset_queue(eth->netdev[i]);
        if (eth->scratch_ring) {
                dma_free_coherent(eth->dma_dev,
@@ -85,7 +85,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                eth->scratch_ring = NULL;
                eth->phy_scratch_ring = 0;
        }
-@@ -3368,6 +3371,9 @@ static const struct mtk_soc_data mt2701_
+@@ -3371,6 +3374,9 @@ static const struct mtk_soc_data mt2701_
        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7623_CLKS_BITMAP,
        .required_pctl = true,
@@ -95,7 +95,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  static const struct mtk_soc_data mt7621_data = {
-@@ -3376,6 +3382,9 @@ static const struct mtk_soc_data mt7621_
+@@ -3379,6 +3385,9 @@ static const struct mtk_soc_data mt7621_
        .required_clks = MT7621_CLKS_BITMAP,
        .required_pctl = false,
        .offload_version = 2,
@@ -105,7 +105,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  static const struct mtk_soc_data mt7622_data = {
-@@ -3385,6 +3394,9 @@ static const struct mtk_soc_data mt7622_
+@@ -3388,6 +3397,9 @@ static const struct mtk_soc_data mt7622_
        .required_clks = MT7622_CLKS_BITMAP,
        .required_pctl = false,
        .offload_version = 2,
@@ -115,7 +115,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  static const struct mtk_soc_data mt7623_data = {
-@@ -3393,6 +3405,9 @@ static const struct mtk_soc_data mt7623_
+@@ -3396,6 +3408,9 @@ static const struct mtk_soc_data mt7623_
        .required_clks = MT7623_CLKS_BITMAP,
        .required_pctl = true,
        .offload_version = 2,
@@ -125,7 +125,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  static const struct mtk_soc_data mt7629_data = {
-@@ -3401,6 +3416,9 @@ static const struct mtk_soc_data mt7629_
+@@ -3404,6 +3419,9 @@ static const struct mtk_soc_data mt7629_
        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7629_CLKS_BITMAP,
        .required_pctl = false,
@@ -135,7 +135,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  static const struct mtk_soc_data rt5350_data = {
-@@ -3408,6 +3426,9 @@ static const struct mtk_soc_data rt5350_
+@@ -3411,6 +3429,9 @@ static const struct mtk_soc_data rt5350_
        .hw_features = MTK_HW_FEATURES_MT7628,
        .required_clks = MT7628_CLKS_BITMAP,
        .required_pctl = false,