kernel: bump 5.15 to 5.15.115

[openwrt/openwrt.git] / target / linux / generic / backport-5.15 / 729-08-v6.2-net-ethernet-mtk_eth_soc-fix-RSTCTRL_PPE-0-1-definit.patch

diff --git a/target/linux/generic/backport-5.15/729-08-v6.2-net-ethernet-mtk_eth_soc-fix-RSTCTRL_PPE-0-1-definit.patch b/target/linux/generic/backport-5.15/729-08-v6.2-net-ethernet-mtk_eth_soc-fix-RSTCTRL_PPE-0-1-definit.patch
index 69df58eed1c80be3d0c74bf6789cdf1055bb0c4e..12aa3ebf6a7cefd4b314aca9133174c5a6babb8d 100644 (file)
--- a/target/linux/generic/backport-5.15/729-08-v6.2-net-ethernet-mtk_eth_soc-fix-RSTCTRL_PPE-0-1-definit.patch
+++ b/target/linux/generic/backport-5.15/729-08-v6.2-net-ethernet-mtk_eth_soc-fix-RSTCTRL_PPE-0-1-definit.patch
@@ -13,7 +13,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -3238,16 +3238,17 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -3239,16 +3239,17 @@ static int mtk_hw_init(struct mtk_eth *e
                return 0;
        }
  
@@ -39,7 +39,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                regmap_write(eth->ethsys, ETHSYS_FE_RST_CHK_IDLE_EN,
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
-@@ -444,18 +444,14 @@
+@@ -445,18 +445,14 @@
  /* ethernet reset control register */
  #define ETHSYS_RSTCTRL                        0x34
  #define RSTCTRL_FE                    BIT(6)