kernel: bump 5.15 to 5.15.132

[openwrt/staging/hauke.git] / target / linux / generic / backport-5.15 / 750-v6.5-17-net-ethernet-mtk_eth_soc-add-reset-bits-for-MT7988.patch

diff --git a/target/linux/generic/backport-5.15/750-v6.5-17-net-ethernet-mtk_eth_soc-add-reset-bits-for-MT7988.patch b/target/linux/generic/backport-5.15/750-v6.5-17-net-ethernet-mtk_eth_soc-add-reset-bits-for-MT7988.patch
index 5f6651b7b02cf02e0a0e4cc5a053062f5cc3668c..2d750abb45ab8573e9948878a4d5457defce398e 100644 (file)
--- a/target/linux/generic/backport-5.15/750-v6.5-17-net-ethernet-mtk_eth_soc-add-reset-bits-for-MT7988.patch
+++ b/target/linux/generic/backport-5.15/750-v6.5-17-net-ethernet-mtk_eth_soc-add-reset-bits-for-MT7988.patch
@@ -16,7 +16,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -3538,19 +3538,34 @@ static void mtk_hw_reset(struct mtk_eth
+@@ -3541,19 +3541,34 @@ static void mtk_hw_reset(struct mtk_eth
  {
        u32 val;
  
@@ -56,7 +56,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                regmap_write(eth->ethsys, ETHSYS_FE_RST_CHK_IDLE_EN,
                             0x3ffffff);
  }
-@@ -3576,13 +3591,21 @@ static void mtk_hw_warm_reset(struct mtk
+@@ -3579,13 +3594,21 @@ static void mtk_hw_warm_reset(struct mtk
                return;
        }
  
@@ -83,7 +83,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  
        regmap_update_bits(eth->ethsys, ETHSYS_RSTCTRL, rst_mask, rst_mask);
  
-@@ -3934,11 +3957,17 @@ static void mtk_prepare_for_reset(struct
+@@ -3937,11 +3960,17 @@ static void mtk_prepare_for_reset(struct
        u32 val;
        int i;
  
@@ -106,7 +106,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  
        /* adjust PPE configurations to prepare for reset */
        for (i = 0; i < ARRAY_SIZE(eth->ppe); i++)
-@@ -3999,11 +4028,18 @@ static void mtk_pending_work(struct work
+@@ -4002,11 +4031,18 @@ static void mtk_pending_work(struct work
                }
        }