kernel: bump 5.10 to 5.10.61

Manually rebased: bcm27xx/patches-5.10/950-1031-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch Removed upstreamed: mvebu/patches-5.10/101-cpufreq-armada-37xx-forbid-cpufreq-for-1.2-GHz-variant.patch All other patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B Run-tested: bcm2711/RPi4B No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us>
arrmo · Aug 29, 2021 · 6b1cd3e · 6b1cd3e
1 parent 1c8214d
commit 6b1cd3e
Show file tree

Hide file tree

Showing 25 changed files with 40 additions and 105 deletions.
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
@@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL
 endif
 
 LINUX_VERSION-5.4 = .142
-LINUX_VERSION-5.10 = .60
+LINUX_VERSION-5.10 = .61
 
 LINUX_KERNEL_HASH-5.4.142 = 99785728968564ba27c7e552d024b560072dcbc885540912eabb5c021e231451
-LINUX_KERNEL_HASH-5.10.60 = 696ff7753f6c7c5123dbcb0a22d693cb358c760c61a76649531b6a207155f78d
+LINUX_KERNEL_HASH-5.10.61 = 82eae38cc5cd11dd6aaac91c02ff0d006c7bafd6d4cf5c6a791930820a3a91d1
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

diff --git a/target/linux/bcm27xx/patches-5.10/950-0030-lan78xx-Enable-LEDs-and-auto-negotiation.patch b/target/linux/bcm27xx/patches-5.10/950-0030-lan78xx-Enable-LEDs-and-auto-negotiation.patch
@@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
-@@ -2453,6 +2453,11 @@ static int lan78xx_reset(struct lan78xx_
+@@ -2461,6 +2461,11 @@ static int lan78xx_reset(struct lan78xx_
  	int ret = 0;
  	unsigned long timeout;
  	u8 sig;
@@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
  	ret = lan78xx_read_reg(dev, HW_CFG, &buf);
  	buf |= HW_CFG_LRST_;
-@@ -2506,6 +2511,9 @@ static int lan78xx_reset(struct lan78xx_
+@@ -2514,6 +2519,9 @@ static int lan78xx_reset(struct lan78xx_
 
  	ret = lan78xx_read_reg(dev, HW_CFG, &buf);
  	buf |= HW_CFG_MEF_;
@@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  	ret = lan78xx_write_reg(dev, HW_CFG, buf);
 
  	ret = lan78xx_read_reg(dev, USB_CFG0, &buf);
-@@ -2561,6 +2569,9 @@ static int lan78xx_reset(struct lan78xx_
+@@ -2569,6 +2577,9 @@ static int lan78xx_reset(struct lan78xx_
  			buf |= MAC_CR_AUTO_DUPLEX_ | MAC_CR_AUTO_SPEED_;
  		}
  	}

diff --git a/target/linux/bcm27xx/patches-5.10/950-0040-Add-dwc_otg-driver.patch b/target/linux/bcm27xx/patches-5.10/950-0040-Add-dwc_otg-driver.patch
@@ -1134,7 +1134,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  				USB_PORT_FEAT_C_OVER_CURRENT);
 --- a/drivers/usb/core/message.c
 +++ b/drivers/usb/core/message.c
-@@ -2129,6 +2129,85 @@ free_interfaces:
+@@ -2135,6 +2135,85 @@ free_interfaces:
  	if (cp->string == NULL &&
  			!(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS))
  		cp->string = usb_cache_string(dev, cp->desc.iConfiguration);

diff --git a/target/linux/bcm27xx/patches-5.10/950-0076-lan78xx-Read-initial-EEE-status-from-DT.patch b/target/linux/bcm27xx/patches-5.10/950-0076-lan78xx-Read-initial-EEE-status-from-DT.patch
@@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
-@@ -2635,6 +2635,22 @@ static int lan78xx_open(struct net_devic
+@@ -2643,6 +2643,22 @@ static int lan78xx_open(struct net_devic
 
  	netif_dbg(dev, ifup, dev->net, "phy initialised successfully");
 

diff --git a/...inux/bcm27xx/patches-5.10/950-0082-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch b/...inux/bcm27xx/patches-5.10/950-0082-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch
@@ -37,7 +37,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data)
  {
  	u32 *buf = kmalloc(sizeof(u32), GFP_KERNEL);
-@@ -2917,8 +2926,14 @@ static int lan78xx_bind(struct lan78xx_n
+@@ -2925,8 +2934,14 @@ static int lan78xx_bind(struct lan78xx_n
  	if (DEFAULT_RX_CSUM_ENABLE)
  		dev->net->features |= NETIF_F_RXCSUM;
 

diff --git a/...linux/bcm27xx/patches-5.10/950-0083-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch b/...linux/bcm27xx/patches-5.10/950-0083-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch
@@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
-@@ -2167,6 +2167,22 @@ static int lan78xx_phy_init(struct lan78
+@@ -2175,6 +2175,22 @@ static int lan78xx_phy_init(struct lan78
  	mii_adv_to_linkmode_adv_t(fc, mii_adv);
  	linkmode_or(phydev->advertising, fc, phydev->advertising);
 
@@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  	if (phydev->mdio.dev.of_node) {
  		u32 reg;
  		int len;
-@@ -2644,22 +2660,6 @@ static int lan78xx_open(struct net_devic
+@@ -2652,22 +2668,6 @@ static int lan78xx_open(struct net_devic
 
  	netif_dbg(dev, ifup, dev->net, "phy initialised successfully");
 

diff --git a/...x/bcm27xx/patches-5.10/950-0094-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch b/...x/bcm27xx/patches-5.10/950-0094-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch
@@ -28,7 +28,7 @@ See: https://github.com/raspberrypi/linux/issues/2447
  static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data)
  {
  	u32 *buf = kmalloc(sizeof(u32), GFP_KERNEL);
-@@ -3760,7 +3765,13 @@ static int lan78xx_probe(struct usb_inte
+@@ -3768,7 +3773,13 @@ static int lan78xx_probe(struct usb_inte
  	netdev->max_mtu = MAX_SINGLE_PACKET_SIZE;
  	netif_set_gso_max_size(netdev, MAX_SINGLE_PACKET_SIZE - MAX_HEADER);
 

diff --git a/target/linux/bcm27xx/patches-5.10/950-0095-lan78xx-EEE-support-is-now-a-PHY-property.patch b/target/linux/bcm27xx/patches-5.10/950-0095-lan78xx-EEE-support-is-now-a-PHY-property.patch
@@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
-@@ -2172,7 +2172,7 @@ static int lan78xx_phy_init(struct lan78
+@@ -2180,7 +2180,7 @@ static int lan78xx_phy_init(struct lan78
  	mii_adv_to_linkmode_adv_t(fc, mii_adv);
  	linkmode_or(phydev->advertising, fc, phydev->advertising);
 

diff --git a/...et/linux/bcm27xx/patches-5.10/950-0098-lan78xx-use-default-alignment-for-rx-buffers.patch b/...et/linux/bcm27xx/patches-5.10/950-0098-lan78xx-use-default-alignment-for-rx-buffers.patch
@@ -12,7 +12,7 @@ in both dwc_otg and in ipv6 processing.
 
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
-@@ -3161,7 +3161,7 @@ static int rx_submit(struct lan78xx_net
+@@ -3169,7 +3169,7 @@ static int rx_submit(struct lan78xx_net
  	size_t size = dev->rx_urb_size;
  	int ret = 0;
 

diff --git a/...et/linux/bcm27xx/patches-5.10/950-0127-mmc-sdhci-iproc-Fix-vmmc-regulators-on-iProc.patch b/...et/linux/bcm27xx/patches-5.10/950-0127-mmc-sdhci-iproc-Fix-vmmc-regulators-on-iProc.patch
@@ -18,8 +18,8 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 --- a/drivers/mmc/host/sdhci-iproc.c
 +++ b/drivers/mmc/host/sdhci-iproc.c
-@@ -173,6 +173,17 @@ static unsigned int sdhci_iproc_get_max_
- 		return pltfm_host->clock;
+@@ -190,6 +190,17 @@ static unsigned int sdhci_iproc_bcm2711_
+ 	return 200000;
  }
 
 +static void sdhci_iproc_set_power(struct sdhci_host *host, unsigned char mode,
@@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  static const struct sdhci_ops sdhci_iproc_ops = {
  	.set_clock = sdhci_set_clock,
  	.get_max_clock = sdhci_iproc_get_max_clock,
-@@ -190,6 +201,7 @@ static const struct sdhci_ops sdhci_ipro
+@@ -207,6 +218,7 @@ static const struct sdhci_ops sdhci_ipro
  	.write_b = sdhci_iproc_writeb,
  	.set_clock = sdhci_set_clock,
  	.get_max_clock = sdhci_iproc_get_max_clock,

diff --git a/.../bcm27xx/patches-5.10/950-0138-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch b/.../bcm27xx/patches-5.10/950-0138-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch
@@ -46,7 +46,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
   * have been called previously.  Use for set_configuration, set_interface,
 --- a/drivers/usb/core/message.c
 +++ b/drivers/usb/core/message.c
-@@ -1259,6 +1259,21 @@ static void remove_intf_ep_devs(struct u
+@@ -1265,6 +1265,21 @@ static void remove_intf_ep_devs(struct u
  	intf->ep_devs_created = 0;
  }
 

diff --git a/...linux/bcm27xx/patches-5.10/950-0401-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch b/...linux/bcm27xx/patches-5.10/950-0401-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch
@@ -27,6 +27,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 +	/* Acknowledge any pending PHY interrupt, lest it be the last */
 +	phy_read(phydev, LAN88XX_INT_STS);
 +
+ 	mutex_lock(&phydev->lock);
  	phy_read_status(phydev);
-
- 	if (!phydev->link && dev->link_on) {
+ 	link = phydev->link;
diff --git a/target/linux/bcm27xx/patches-5.10/950-0555-r8152-support-new-chips.patch b/target/linux/bcm27xx/patches-5.10/950-0555-r8152-support-new-chips.patch
@@ -920,7 +920,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 +	case RTL_VER_15:
  	default:
  		if (type == MCU_TYPE_USB) {
- 			ocp_write_byte(tp, MCU_TYPE_USB, USB_BP2_EN, 0);
+ 			ocp_write_word(tp, MCU_TYPE_USB, USB_BP2_EN, 0);
 @@ -3653,6 +4100,11 @@ static bool rtl8152_is_fw_mac_ok(struct
  		case RTL_VER_06:
  		case RTL_VER_08:

diff --git a/target/linux/generic/pending-5.10/810-pci_disable_common_quirks.patch b/target/linux/generic/pending-5.10/810-pci_disable_common_quirks.patch
@@ -33,7 +33,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  /*
   * The Mellanox Tavor device gives false positive parity errors.  Mark this
   * device with a broken_parity_status to allow PCI scanning code to "skip"
-@@ -3321,6 +3322,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+@@ -3322,6 +3323,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata);
 
@@ -42,7 +42,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  /*
   * Ivytown NTB BAR sizes are misreported by the hardware due to an erratum.
   * To work around this, query the size it should be configured to by the
-@@ -3346,6 +3349,8 @@ static void quirk_intel_ntb(struct pci_d
+@@ -3347,6 +3350,8 @@ static void quirk_intel_ntb(struct pci_d
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e08, quirk_intel_ntb);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e0d, quirk_intel_ntb);
 
@@ -51,7 +51,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  /*
   * Some BIOS implementations leave the Intel GPU interrupts enabled, even
   * though no one is handling them (e.g., if the i915 driver is never
-@@ -3384,6 +3389,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
+@@ -3385,6 +3390,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq);
 

diff --git a/...inux/mediatek/patches-5.10/171-dt-bindings-usb-convert-mediatek-musb.txt-to-YAML-sc.patch b/...inux/mediatek/patches-5.10/171-dt-bindings-usb-convert-mediatek-musb.txt-to-YAML-sc.patch
@@ -17,9 +17,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  delete mode 100644 Documentation/devicetree/bindings/usb/mediatek,musb.txt
  create mode 100644 Documentation/devicetree/bindings/usb/mediatek,musb.yaml
 
-diff --git a/Documentation/devicetree/bindings/usb/mediatek,musb.txt b/Documentation/devicetree/bindings/usb/mediatek,musb.txt
-deleted file mode 100644
-index 5eedb02965622..0000000000000
 --- a/Documentation/devicetree/bindings/usb/mediatek,musb.txt
 +++ /dev/null
 @@ -1,57 +0,0 @@
@@ -80,9 +77,6 @@ index 5eedb02965622..0000000000000
 -		vbus-supply = <&usb_vbus>;
 -	};
 -};
-diff --git a/Documentation/devicetree/bindings/usb/mediatek,musb.yaml b/Documentation/devicetree/bindings/usb/mediatek,musb.yaml
-new file mode 100644
-index 0000000000000..790efe8b62746
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/usb/mediatek,musb.yaml
 @@ -0,0 +1,113 @@
@@ -199,6 +193,3 @@ index 0000000000000..790efe8b62746
 +        };
 +    };
 +...
--- 
-2.32.0
-
diff --git a/...linux/mediatek/patches-5.10/172-dt-bindings-usb-mediatek-musb-add-mt8516-compatbile.patch b/...linux/mediatek/patches-5.10/172-dt-bindings-usb-mediatek-musb-add-mt8516-compatbile.patch
@@ -13,8 +13,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  Documentation/devicetree/bindings/usb/mediatek,musb.yaml | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/Documentation/devicetree/bindings/usb/mediatek,musb.yaml b/Documentation/devicetree/bindings/usb/mediatek,musb.yaml
-index 790efe8b62746..84ddacfdbe9b0 100644
 --- a/Documentation/devicetree/bindings/usb/mediatek,musb.yaml
 +++ b/Documentation/devicetree/bindings/usb/mediatek,musb.yaml
 @@ -17,6 +17,7 @@ properties:
@@ -25,6 +23,3 @@ index 790efe8b62746..84ddacfdbe9b0 100644
            - mediatek,mt2701-musb
        - const: mediatek,mtk-musb
 
--- 
-2.32.0
-
diff --git a/target/linux/mediatek/patches-5.10/172-dt-bindings-usb-mtk-musb-add-MT7623-compatible.patch b/target/linux/mediatek/patches-5.10/172-dt-bindings-usb-mtk-musb-add-MT7623-compatible.patch
@@ -11,8 +11,6 @@ Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
  Documentation/devicetree/bindings/usb/mediatek,musb.yaml | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/Documentation/devicetree/bindings/usb/mediatek,musb.yaml b/Documentation/devicetree/bindings/usb/mediatek,musb.yaml
-index 84ddacfdbe9b0..03d62d60ce5fe 100644
 --- a/Documentation/devicetree/bindings/usb/mediatek,musb.yaml
 +++ b/Documentation/devicetree/bindings/usb/mediatek,musb.yaml
 @@ -19,6 +19,7 @@ properties:
@@ -23,6 +21,3 @@ index 84ddacfdbe9b0..03d62d60ce5fe 100644
        - const: mediatek,mtk-musb
 
    reg:
--- 
-2.32.0
-
diff --git a/target/linux/mediatek/patches-5.10/173-arm-dts-mt7623-add-musb-device-nodes.patch b/target/linux/mediatek/patches-5.10/173-arm-dts-mt7623-add-musb-device-nodes.patch
@@ -11,11 +11,9 @@ Signed-off-by: Sungbo Eo <mans0n@gorani.run>
  arch/arm/boot/dts/mt7623a.dtsi |  4 ++++
  2 files changed, 38 insertions(+)
 
-diff --git a/arch/arm/boot/dts/mt7623.dtsi b/arch/arm/boot/dts/mt7623.dtsi
-index 3c11f7cfcc401..790d74439cc66 100644
 --- a/arch/arm/boot/dts/mt7623.dtsi
 +++ b/arch/arm/boot/dts/mt7623.dtsi
-@@ -585,6 +585,40 @@ spi2: spi@11017000 {
+@@ -585,6 +585,40 @@
  		status = "disabled";
  	};
 
@@ -56,11 +54,9 @@ index 3c11f7cfcc401..790d74439cc66 100644
  	audsys: clock-controller@11220000 {
  		compatible = "mediatek,mt7623-audsys",
  			     "mediatek,mt2701-audsys",
-diff --git a/arch/arm/boot/dts/mt7623a.dtsi b/arch/arm/boot/dts/mt7623a.dtsi
-index 0735a1fb8ad9a..d304b62d24b58 100644
 --- a/arch/arm/boot/dts/mt7623a.dtsi
 +++ b/arch/arm/boot/dts/mt7623a.dtsi
-@@ -35,6 +35,10 @@ &scpsys {
+@@ -35,6 +35,10 @@
  	clock-names = "ethif";
  };
 
@@ -71,6 +67,3 @@ index 0735a1fb8ad9a..d304b62d24b58 100644
  &usb1 {
  	power-domains = <&scpsys MT7623A_POWER_DOMAIN_HIF>;
  };
--- 
-2.32.0
-
diff --git a/target/linux/mediatek/patches-5.10/330-mtk-bmt-support.patch b/target/linux/mediatek/patches-5.10/330-mtk-bmt-support.patch
@@ -836,7 +836,7 @@
  #include <linux/mtd/partitions.h>
  #include <linux/of_platform.h>
 
-@@ -608,6 +609,8 @@ static int mtk_snand_probe(struct platfo
+@@ -612,6 +613,8 @@ static int mtk_snand_probe(struct platfo
  	mtd->_block_isbad = mtk_snand_mtd_block_isbad;
  	mtd->_block_markbad = mtk_snand_mtd_block_markbad;
 
@@ -845,15 +845,15 @@
  	ret = mtd_device_register(mtd, NULL, 0);
  	if (ret) {
  		dev_err(msm->pdev.dev, "failed to register mtd partition\n");
-@@ -619,6 +622,7 @@ static int mtk_snand_probe(struct platfo
+@@ -623,6 +626,7 @@ static int mtk_snand_probe(struct platfo
  	return 0;
 
  errout4:
 +	mtk_bmt_detach(mtd);
  	devm_kfree(msm->pdev.dev, msm->page_cache);
 
  errout3:
-@@ -646,6 +650,8 @@ static int mtk_snand_remove(struct platf
+@@ -650,6 +654,8 @@ static int mtk_snand_remove(struct platf
  	if (ret)
  		return ret;
 

diff --git a/...inux/mediatek/patches-5.10/602-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch b/...inux/mediatek/patches-5.10/602-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch
@@ -253,7 +253,7 @@ Signed-off-by: chuanjia.liu <Chuanjia.Liu@mediatek.com>
  				#interrupt-cells = <1>;
 --- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
 +++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
-@@ -296,18 +296,16 @@
+@@ -288,18 +288,16 @@
  	};
  };
 
@@ -281,7 +281,7 @@ Signed-off-by: chuanjia.liu <Chuanjia.Liu@mediatek.com>
  &pio {
 --- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
 +++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
-@@ -801,45 +801,41 @@
+@@ -802,45 +802,41 @@
  		#reset-cells = <1>;
  	};
 
@@ -344,7 +344,7 @@ Signed-off-by: chuanjia.liu <Chuanjia.Liu@mediatek.com>
  			interrupt-map-mask = <0 0 0 7>;
  			interrupt-map = <0 0 0 1 &pcie_intc0 0>,
  					<0 0 0 2 &pcie_intc0 1>,
-@@ -851,15 +847,39 @@
+@@ -852,15 +848,39 @@
  				#interrupt-cells = <1>;
  			};
  		};

diff --git a/target/linux/mediatek/patches-5.10/603-ARM-dts-mediatek-Update-mt7629-PCIe-node.patch b/target/linux/mediatek/patches-5.10/603-ARM-dts-mediatek-Update-mt7629-PCIe-node.patch
@@ -149,7 +149,7 @@ Signed-off-by: chuanjia.liu <Chuanjia.Liu@mediatek.com>
  &pciephy1 {
 --- a/arch/arm/boot/dts/mt7629.dtsi
 +++ b/arch/arm/boot/dts/mt7629.dtsi
-@@ -382,16 +382,21 @@
+@@ -376,16 +376,21 @@
  			#reset-cells = <1>;
  		};
 
@@ -177,7 +177,7 @@ Signed-off-by: chuanjia.liu <Chuanjia.Liu@mediatek.com>
  			clocks = <&pciesys CLK_PCIE_P1_MAC_EN>,
  				 <&pciesys CLK_PCIE_P0_AHB_EN>,
  				 <&pciesys CLK_PCIE_P1_AUX_EN>,
-@@ -412,21 +417,19 @@
+@@ -406,21 +411,19 @@
  			power-domains = <&scpsys MT7622_POWER_DOMAIN_HIF0>;
  			bus-range = <0x00 0xff>;
  			ranges = <0x82000000 0 0x20000000 0x20000000 0 0x10000000>;

diff --git a/...inux/mediatek/patches-5.10/700-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch b/...inux/mediatek/patches-5.10/700-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch
@@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  			interface-type = "ace";
  			reg = <0x5000 0x1000>;
  		};
-@@ -976,6 +976,8 @@
+@@ -977,6 +977,8 @@
  		power-domains = <&scpsys MT7622_POWER_DOMAIN_ETHSYS>;
  		mediatek,ethsys = <&ethsys>;
  		mediatek,sgmiisys = <&sgmiisys>;