[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede:
  kernel: bump 5.19 to 5.19.11 (coolsnowwolf#10172)
  kernel: bump 5.10 to 5.10.145 (coolsnowwolf#10173)
  kernel: bump 5.15 to 5.15.70 (coolsnowwolf#10174)
  meson: add support for Thunder OneCloud
  meson: fixes support for Amlogic S805

include/kernel-5.10

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .143
-LINUX_KERNEL_HASH-5.10.143 = fa2c9edef272d39dca52e057e1d41433cf1b6ab6a00d24a00333c0b735054e91
+LINUX_VERSION-5.10 = .145
+LINUX_KERNEL_HASH-5.10.145 = fc5990f3e57479369eaf193bd7760b84f26d2b670c2d88e473101cb679c5ac61

include/kernel-5.15

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .69
-LINUX_KERNEL_HASH-5.15.69 = e32839ca761e5251f25708f7939b37b101d28fc29515a97bfc0c838a21efdf34
+LINUX_VERSION-5.15 = .70
+LINUX_KERNEL_HASH-5.15.70 = 1a7c26f0253407bb222786c8cbf2ee6235acebe8ea641fe0bc2360acce970d76

include/kernel-5.19

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.19 = .10
-LINUX_KERNEL_HASH-5.19.10 = 67dab932e85f9b9062ced666c8ea888230a1dadfd624b05aead6b6ebc6d3bdd5
+LINUX_VERSION-5.19 = .11
+LINUX_KERNEL_HASH-5.19.11 = 5554d2f90b806bb3454fcf3432882cf85077d660a89db5a4e8d7375271e3d973

target/linux/bcm53xx/patches-5.10/180-usb-xhci-add-support-for-performing-fake-doorbell.patch

@@ -19,7 +19,7 @@ it on BCM4708 family.
 
 --- a/drivers/usb/host/xhci-plat.c
 +++ b/drivers/usb/host/xhci-plat.c
-@@ -77,6 +77,8 @@ static int xhci_priv_resume_quirk(struct
+@@ -87,6 +87,8 @@ static int xhci_priv_resume_quirk(struct
  static void xhci_plat_quirks(struct device *dev, struct xhci_hcd *xhci)
  {
  	struct xhci_plat_priv *priv = xhci_to_priv(xhci);
@@ -28,7 +28,7 @@ it on BCM4708 family.
 
  	/*
  	 * As of now platform drivers don't provide MSI support so we ensure
-@@ -84,6 +86,9 @@ static void xhci_plat_quirks(struct devi
+@@ -94,6 +96,9 @@ static void xhci_plat_quirks(struct devi
  	 * dev struct in order to setup MSI
  	 */
  	xhci->quirks |= XHCI_PLAT | priv->quirks;

target/linux/generic/backport-5.10/774-v5.15-net-dsa-mv88e6xxx-keep-the-pvid-at-0-when-VLAN-unawa.patch

@@ -63,7 +63,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
 
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -1586,6 +1586,26 @@ static int mv88e6xxx_port_check_hw_vlan(
+@@ -1590,6 +1590,26 @@ static int mv88e6xxx_port_check_hw_vlan(
  	return 0;
  }
 
@@ -90,7 +90,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
  static int mv88e6xxx_port_vlan_filtering(struct dsa_switch *ds, int port,
  					 bool vlan_filtering,
  					 struct switchdev_trans *trans)
-@@ -1599,7 +1619,16 @@ static int mv88e6xxx_port_vlan_filtering
+@@ -1603,7 +1623,16 @@ static int mv88e6xxx_port_vlan_filtering
  		return chip->info->max_vid ? 0 : -EOPNOTSUPP;
 
  	mv88e6xxx_reg_lock(chip);
@@ -107,7 +107,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
  	mv88e6xxx_reg_unlock(chip);
 
  	return err;
-@@ -1982,8 +2011,10 @@ static void mv88e6xxx_port_vlan_add(stru
+@@ -1986,8 +2015,10 @@ static void mv88e6xxx_port_vlan_add(stru
  	struct mv88e6xxx_chip *chip = ds->priv;
  	bool untagged = vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED;
  	bool pvid = vlan->flags & BRIDGE_VLAN_INFO_PVID;
@@ -118,7 +118,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
  	u16 vid;
 
  	if (!chip->info->max_vid)
-@@ -2008,9 +2039,23 @@ static void mv88e6xxx_port_vlan_add(stru
+@@ -2012,9 +2043,23 @@ static void mv88e6xxx_port_vlan_add(stru
  			dev_err(ds->dev, "p%d: failed to add VLAN %d%c\n", port,
  				vid, untagged ? 'u' : 't');
 
@@ -145,15 +145,15 @@ Signed-off-by: Jakub Kicinski <[email protected]>
 
  	mv88e6xxx_reg_unlock(chip);
  }
-@@ -2061,6 +2106,7 @@ static int mv88e6xxx_port_vlan_del(struc
+@@ -2065,6 +2110,7 @@ static int mv88e6xxx_port_vlan_del(struc
  				   const struct switchdev_obj_port_vlan *vlan)
  {
  	struct mv88e6xxx_chip *chip = ds->priv;
 +	struct mv88e6xxx_port *p = &chip->ports[port];
  	u16 pvid, vid;
  	int err = 0;
 
-@@ -2079,7 +2125,9 @@ static int mv88e6xxx_port_vlan_del(struc
+@@ -2083,7 +2129,9 @@ static int mv88e6xxx_port_vlan_del(struc
  			goto unlock;
 
  		if (vid == pvid) {

target/linux/generic/backport-5.15/011-kbuild-export-SUBARCH.patch

@@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -523,7 +523,7 @@ KBUILD_LDFLAGS_MODULE :=
+@@ -525,7 +525,7 @@ KBUILD_LDFLAGS_MODULE :=
  KBUILD_LDFLAGS :=
  CLANG_FLAGS :=
 

target/linux/generic/backport-5.15/403-v6.1-mtd-allow-getting-MTD-device-associated-with-a-speci.patch

@@ -25,7 +25,7 @@ Signed-off-by: Srinivas Kandagatla <[email protected]>
 
 --- a/drivers/mtd/mtdcore.c
 +++ b/drivers/mtd/mtdcore.c
-@@ -1227,6 +1227,34 @@ int __get_mtd_device(struct mtd_info *mt
+@@ -1166,6 +1166,34 @@ int __get_mtd_device(struct mtd_info *mt
  EXPORT_SYMBOL_GPL(__get_mtd_device);
 
  /**

target/linux/generic/backport-5.15/703-00-v5.16-net-convert-users-of-bitmap_foo-to-linkmode_foo.patch

@@ -530,7 +530,7 @@ Signed-off-by: David S. Miller <[email protected]>
  static int
 --- a/drivers/net/dsa/xrs700x/xrs700x.c
 +++ b/drivers/net/dsa/xrs700x/xrs700x.c
-@@ -456,7 +456,7 @@ static void xrs700x_phylink_validate(str
+@@ -457,7 +457,7 @@ static void xrs700x_phylink_validate(str
  		phylink_set(mask, 1000baseT_Full);
  		break;
  	default:
@@ -539,7 +539,7 @@ Signed-off-by: David S. Miller <[email protected]>
  		dev_err(ds->dev, "Unsupported port: %i\n", port);
  		return;
  	}
-@@ -467,10 +467,8 @@ static void xrs700x_phylink_validate(str
+@@ -468,10 +468,8 @@ static void xrs700x_phylink_validate(str
  	phylink_set(mask, 10baseT_Full);
  	phylink_set(mask, 100baseT_Full);
 

target/linux/generic/hack-5.10/710-net-dsa-mv88e6xxx-default-VID-1.patch

@@ -1,14 +1,14 @@
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -2145,6 +2145,7 @@ static int mv88e6xxx_port_fdb_add(struct
+@@ -2149,6 +2149,7 @@ static int mv88e6xxx_port_fdb_add(struct
  	struct mv88e6xxx_chip *chip = ds->priv;
  	int err;
 
 +	vid = vid ? : 1;
  	mv88e6xxx_reg_lock(chip);
  	err = mv88e6xxx_port_db_load_purge(chip, port, addr, vid,
  					   MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC);
-@@ -2159,6 +2160,7 @@ static int mv88e6xxx_port_fdb_del(struct
+@@ -2163,6 +2164,7 @@ static int mv88e6xxx_port_fdb_del(struct
  	struct mv88e6xxx_chip *chip = ds->priv;
  	int err;
 

target/linux/generic/hack-5.10/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch

@@ -1,6 +1,6 @@
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -2707,6 +2707,9 @@ static int mv88e6xxx_setup_port(struct m
+@@ -2711,6 +2711,9 @@ static int mv88e6xxx_setup_port(struct m
  	if (dsa_is_cpu_port(ds, port))
  		reg = 0;
 

target/linux/generic/hack-5.15/661-use_fq_codel_by_default.patch

@@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  EXPORT_SYMBOL(default_qdisc_ops);
 
  static void qdisc_maybe_clear_missed(struct Qdisc *q,
-@@ -1088,12 +1088,12 @@ static void attach_one_default_qdisc(str
+@@ -1103,12 +1103,12 @@ static void attach_one_default_qdisc(str
  				     void *_unused)
  {
  	struct Qdisc *qdisc;

target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch

@@ -1,9 +1,19 @@
+From f81700b6bb2eda3756247bce472d8eaf6f466f61 Mon Sep 17 00:00:00 2001
+From: OpenWrt community <[email protected]>
+Date: Wed, 13 Jul 2022 13:49:26 +0200
+Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
+
+---
+ drivers/net/usb/qmi_wwan.c  | 1 +
+ drivers/usb/serial/option.c | 7 +++++++
+ 2 files changed, 8 insertions(+)
+
 --- a/drivers/net/usb/qmi_wwan.c
 +++ b/drivers/net/usb/qmi_wwan.c
-@@ -1085,6 +1085,7 @@ static const struct usb_device_id produc
- 	{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0512)},	/* Quectel EG12/EM12 */
+@@ -1086,6 +1086,7 @@ static const struct usb_device_id produc
  	{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0620)},	/* Quectel EM160R-GL */
  	{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0800)},	/* Quectel RM500Q-GL */
+ 	{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0801)},	/* Quectel RM520N */
 +	{QMI_MATCH_FF_FF_FF(0x05c6, 0xf601)},   /* MeigLink SLM750 */
 
  	/* 3. Combined interface devices matching on interface number */
@@ -19,7 +29,7 @@
 
  #define QUECTEL_VENDOR_ID			0x2c7c
  /* These Quectel products use Quectel's vendor ID */
-@@ -1133,6 +1135,11 @@ static const struct usb_device_id option
+@@ -1140,6 +1142,11 @@ static const struct usb_device_id option
  	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0, 0) },
  	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
  	  .driver_info = RSVD(4) },

target/linux/generic/hack-5.15/952-add-net-conntrack-events-support-multiple-registrant.patch

@@ -93,7 +93,7 @@ Signed-off-by: Zhi Chen <[email protected]>
  #if defined(CONFIG_NF_CONNTRACK_LABELS)
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
-@@ -151,6 +151,14 @@ config NF_CONNTRACK_EVENTS
+@@ -150,6 +150,14 @@ config NF_CONNTRACK_EVENTS
 
  	  If unsure, say `N'.
 

target/linux/generic/hack-5.15/953-net-patch-linux-kernel-to-support-shortcut-fe.patch

@@ -111,7 +111,7 @@
 
  #ifdef CONFIG_ETHERNET_PACKET_MANGLE
  	if (dev->eth_mangle_tx && !(skb = dev->eth_mangle_tx(dev, skb)))
-@@ -5214,6 +5222,11 @@ void netdev_rx_handler_unregister(struct
+@@ -5215,6 +5223,11 @@ void netdev_rx_handler_unregister(struct
  }
  EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);
 
@@ -123,7 +123,7 @@
  /*
   * Limit the use of PFMEMALLOC reserves to those protocols that implement
   * the special handling of PFMEMALLOC skbs.
-@@ -5262,6 +5275,10 @@ static int __netif_receive_skb_core(stru
+@@ -5263,6 +5276,10 @@ static int __netif_receive_skb_core(stru
  	int ret = NET_RX_DROP;
  	__be16 type;
 
@@ -134,7 +134,7 @@
  	net_timestamp_check(!READ_ONCE(netdev_tstamp_prequeue), skb);
 
  	trace_netif_receive_skb(skb);
-@@ -5299,6 +5316,15 @@ another_round:
+@@ -5300,6 +5317,15 @@ another_round:
  			goto out;
  	}
 

target/linux/generic/pending-5.10/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch

@@ -17,7 +17,7 @@ Signed-off-by: DENG Qingfang <[email protected]>
 
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -2917,6 +2917,7 @@ static int mv88e6xxx_setup(struct dsa_sw
+@@ -2921,6 +2921,7 @@ static int mv88e6xxx_setup(struct dsa_sw
 
  	chip->ds = ds;
  	ds->slave_mii_bus = mv88e6xxx_default_mdio_bus(chip);

target/linux/generic/pending-5.10/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch

@@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz <[email protected]>
 
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -5486,6 +5486,7 @@ static int mv88e6xxx_register_switch(str
+@@ -5490,6 +5490,7 @@ static int mv88e6xxx_register_switch(str
  	ds->ops = &mv88e6xxx_switch_ops;
  	ds->ageing_time_min = chip->info->age_time_coeff;
  	ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX;

target/linux/generic/pending-5.15/020-05-mm-multigenerational-lru-aging.patch

@@ -168,7 +168,7 @@ Change-Id: I3ae8abc3100d023cecb3a699d86020ae6fc10a45
 
  #include <asm/tlbflush.h>
 
-@@ -790,6 +791,13 @@ static bool page_referenced_one(struct p
+@@ -793,6 +794,13 @@ static bool page_referenced_one(struct p
  		}
 
  		if (pvmw.pte) {

target/linux/generic/pending-5.15/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch

@@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <[email protected]>
 
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
-@@ -7556,7 +7556,7 @@ static void __init alloc_node_mem_map(st
+@@ -7557,7 +7557,7 @@ static void __init alloc_node_mem_map(st
  	if (pgdat == NODE_DATA(0)) {
  		mem_map = NODE_DATA(0)->node_mem_map;
  		if (page_to_pfn(mem_map) != pgdat->node_start_pfn)

target/linux/generic/pending-5.15/201-extra_optimization.patch

@@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -759,11 +759,11 @@ KBUILD_CFLAGS	+= $(call cc-disable-warni
+@@ -762,11 +762,11 @@ KBUILD_CFLAGS	+= $(call cc-disable-warni
  KBUILD_CFLAGS	+= $(call cc-disable-warning, address-of-packed-member)
 
  ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE

target/linux/generic/pending-5.15/203-kallsyms_uncompressed.patch

@@ -106,7 +106,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  		}
 --- a/scripts/link-vmlinux.sh
 +++ b/scripts/link-vmlinux.sh
-@@ -266,6 +266,10 @@ kallsyms()
+@@ -257,6 +257,10 @@ kallsyms()
  		kallsymopt="${kallsymopt} --base-relative"
  	fi
 

target/linux/generic/pending-5.15/400-mtd-mtdsplit-support.patch

@@ -297,7 +297,7 @@
  static inline uint32_t mtd_div_by_ws(uint64_t sz, struct mtd_info *mtd)
  {
  	if (mtd->writesize_shift)
-@@ -685,6 +703,13 @@ extern void __put_mtd_device(struct mtd_
+@@ -686,6 +704,13 @@ extern struct mtd_info *of_get_mtd_devic
  extern struct mtd_info *get_mtd_device_nm(const char *name);
  extern void put_mtd_device(struct mtd_info *mtd);
 

target/linux/generic/pending-5.15/495-mtd-core-add-get_mtd_device_by_node.patch

@@ -17,7 +17,7 @@ Reviewed-by: Miquel Raynal <[email protected]>
 
 --- a/drivers/mtd/mtdcore.c
 +++ b/drivers/mtd/mtdcore.c
-@@ -1203,6 +1203,44 @@ out_unlock:
+@@ -1231,6 +1231,44 @@ out_unlock:
  }
  EXPORT_SYMBOL_GPL(get_mtd_device_nm);
 
@@ -64,9 +64,9 @@ Reviewed-by: Miquel Raynal <[email protected]>
  	mutex_lock(&mtd_table_mutex);
 --- a/include/linux/mtd/mtd.h
 +++ b/include/linux/mtd/mtd.h
-@@ -703,6 +703,8 @@ extern struct mtd_info *get_mtd_device(s
- extern int __get_mtd_device(struct mtd_info *mtd);
+@@ -704,6 +704,8 @@ extern int __get_mtd_device(struct mtd_i
  extern void __put_mtd_device(struct mtd_info *mtd);
+ extern struct mtd_info *of_get_mtd_device_by_node(struct device_node *np);
  extern struct mtd_info *get_mtd_device_nm(const char *name);
 +extern struct mtd_info *get_mtd_device_by_node(
 +		const struct device_node *of_node);

target/linux/generic/pending-5.15/700-net-ethernet-mtk_eth_soc-avoid-creating-duplicate-of.patch

@@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
 +++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
-@@ -234,6 +234,9 @@ mtk_flow_offload_replace(struct mtk_eth
+@@ -233,6 +233,9 @@ mtk_flow_offload_replace(struct mtk_eth
  	if (rhashtable_lookup(&eth->flow_table, &f->cookie, mtk_flow_ht_params))
  		return -EEXIST;
 

target/linux/generic/pending-5.15/842-net-qmi_wwan-add-ZTE-MF286D-modem-19d2-1485.patch

@@ -49,7 +49,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
 --- a/drivers/net/usb/qmi_wwan.c
 +++ b/drivers/net/usb/qmi_wwan.c
-@@ -1313,6 +1313,7 @@ static const struct usb_device_id produc
+@@ -1314,6 +1314,7 @@ static const struct usb_device_id produc
  	{QMI_FIXED_INTF(0x19d2, 0x1426, 2)},	/* ZTE MF91 */
  	{QMI_FIXED_INTF(0x19d2, 0x1428, 2)},	/* Telewell TW-LTE 4G v2 */
  	{QMI_FIXED_INTF(0x19d2, 0x1432, 3)},	/* ZTE ME3620 */

target/linux/ipq60xx/patches-5.15/0001-v5.16-arm64-dts-qcom-ipq8074-add-SPMI-bus.patch

@@ -13,11 +13,9 @@ Link: https://lore.kernel.org/r/[email protected]
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 19 +++++++++++++++++++
  1 file changed, 19 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 6b9ac0550490..c37de90616fa 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -293,6 +293,25 @@ gcc: gcc@1800000 {
+@@ -293,6 +293,25 @@
  			#reset-cells = <0x1>;
  		};
 
@@ -43,6 +41,3 @@ index 6b9ac0550490..c37de90616fa 100644
  		sdhc_1: sdhci@7824900 {
  			compatible = "qcom,sdhci-msm-v4";
  			reg = <0x7824900 0x500>, <0x7824000 0x800>;
--- 
-2.37.2
-

target/linux/ipq60xx/patches-5.15/0002-v5.16-arm64-dts-qcom-Update-BAM-DMA-node-name-per-DT-schem.patch

@@ -14,11 +14,9 @@ Link: https://lore.kernel.org/r/[email protected]
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index c37de90616fa..5acbacecbf4f 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -212,7 +212,7 @@ prng: rng@e3000 {
+@@ -212,7 +212,7 @@
  			status = "disabled";
  		};
 
@@ -27,6 +25,3 @@ index c37de90616fa..5acbacecbf4f 100644
  			compatible = "qcom,bam-v1.7.0";
  			reg = <0x00704000 0x20000>;
  			interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>;
--- 
-2.37.2
-

target/linux/ipq60xx/patches-5.15/0003-v5.16-arm64-dts-qcom-ipq8074-Add-QUP5-I2C-node.patch

@@ -14,11 +14,9 @@ Link: https://lore.kernel.org/r/[email protected]
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 5acbacecbf4f..9e700963a1e3 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -430,6 +430,21 @@ blsp1_i2c3: i2c@78b7000 {
+@@ -430,6 +430,21 @@
  			status = "disabled";
  		};
 
@@ -40,6 +38,3 @@ index 5acbacecbf4f..9e700963a1e3 100644
  		blsp1_i2c6: i2c@78ba000 {
  			compatible = "qcom,i2c-qup-v2.2.1";
  			#address-cells = <1>;
--- 
-2.37.2
-