From c026408faeace00168e239afeadc4fd552906310 Mon Sep 17 00:00:00 2001
From: lovehackintosh <92633080+lovehackintosh@users.noreply.github.com>
Date: Sat, 5 Nov 2022 15:25:09 +0800
Subject: [PATCH] kernel: bump 5.15 to 5.15.77 (#10369)

Manually rebased:
   bcm27xx/patches-5.15/950-0600-xhci-quirks-add-link-TRB-quirk-for-VL805.patch
   bcm27xx/patches-5.15/950-0606-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch
   bcm27xx/patches-5.15/950-0717-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch
   bcm53xx/patches-5.15/180-usb-xhci-add-support-for-performing-fake-doorbell.patch
   lantiq/patches-5.15/0028-NET-lantiq-various-etop-fixes.patch

All other patches automatically rebased

Co-authored-by: John Audia <therealgraysky@proton.me>
Signed-off-by: John Audia <therealgraysky@proton.me>
---
 include/kernel-5.15                           |  4 +-
 .../910-unaligned_access_hacks.patch          |  2 +-
 ...070-MMC-added-alternative-MMC-driver.patch |  8 ++--
 ...hci_fixup_endpoint-for-interval-adju.patch |  4 +-
 ...ore-event-ring-segment-table-entries.patch |  4 +-
 ...2.h-add-V4L2_CTRL_FLAG_DYNAMIC_ARRAY.patch |  2 +-
 ...-quirks-add-link-TRB-quirk-for-VL805.patch |  8 ++--
 ...t-TRBS_PER_SEGMENT-define-in-runtime.patch |  6 +--
 ...usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch | 10 ++---
 ...uirk-for-Superspeed-bulk-OUT-transfe.patch | 12 ++---
 ...do-single-sector-reads-during-recove.patch |  2 +-
 ...support-for-performing-fake-doorbell.patch |  6 +--
 ...k-all-interrupts-when-unbinding-driv.patch |  2 +-
 ...ark-Fix-memory-leak-in-driver-unbind.patch |  2 +-
 ...k-Assert-PERST-when-unbinding-driver.patch |  2 +-
 ...able-link-training-when-unbinding-dr.patch |  2 +-
 ...able-common-PHY-when-unbinding-drive.patch |  2 +-
 .../661-use_fq_codel_by_default.patch         |  6 +--
 ...k-events-support-multiple-registrant.patch |  2 +-
 ...-linux-kernel-to-support-shortcut-fe.patch |  4 +-
 ...Add-support-for-MAP-E-FMRs-mesh-mode.patch | 18 ++++----
 ...-arm64-dts-qcom-ipq8074-add-SPMI-bus.patch |  7 +--
 ...pdate-BAM-DMA-node-name-per-DT-schem.patch |  7 +--
 ...4-dts-qcom-ipq8074-Add-QUP5-I2C-node.patch |  7 +--
 ...sm8996-Move-clock-cells-to-QMP-PHY-c.patch | 13 ++----
 ...qcom-Correct-QMP-PHY-child-node-name.patch |  9 +---
 ...-dts-qcom-Fix-IPQ8074-PCIe-PHY-nodes.patch |  7 +--
 ...-arm64-dts-qcom-ipq8074-add-MDIO-bus.patch |  7 +--
 ...64-dts-qcom-ipq8074-add-SMEM-support.patch |  9 +---
 ...ipq8074-add-the-reserved-memory-node.patch |  7 +--
 ...om-ipq8074-enable-the-GICv2m-support.patch |  7 +--
 ...pq8074-drop-the-clock-frequency-prop.patch |  7 +--
 ...lign-dmas-in-I2C-SPI-UART-with-DT-sc.patch | 13 ++----
 ...lign-clocks-in-I2C-SPI-with-DT-schem.patch | 13 ++----
 ...orrect-DWC3-node-names-and-unit-addr.patch |  9 +---
 ...pq8074-add-dedicated-qcom-ipq8074-dw.patch |  9 +---
 ...align-DWC3-USB-clocks-with-DT-schema.patch |  9 +---
 ...64-dts-qcom-adjust-whitespace-around.patch |  9 +---
 ...ts-qcom-Fix-sdhci-node-names-use-mmc.patch |  7 +--
 ...ix-ordering-of-clocks-clock-names-fo.patch |  7 +--
 ...ck-qcom-ipq8074-add-PPE-crypto-clock.patch |  5 ---
 ...lk-qcom-ipq8074-add-PPE-crypto-clock.patch |  9 +---
 ...ngs-clock-qcom-ipq8074-add-USB-GDSCs.patch |  5 ---
 ...-v6.0-clk-qcom-ipq8074-add-USB-GDSCs.patch | 13 ++----
 ...s-qcom-ipq8074-add-USB-power-domains.patch | 11 ++---
 ...pq8074-move-ARMv8-timer-out-of-SoC-n.patch |  9 +---
 ...-dts-qcom-ipq8074-add-reset-to-SDHCI.patch |  7 +--
 ...com-ipq8074-drop-USB-PHY-clock-index.patch |  9 +---
 ...arm64-dts-qcom-ipq8074-add-APCS-node.patch |  7 +--
 ...pq8074-add-size-address-cells-to-DTS.patch |  9 ----
 ...ipq8074-add-interrupt-parent-to-DTSI.patch | 11 +----
 ...or-qcom_spmi-add-support-for-HT_P150.patch |  9 +---
 ...or-qcom_spmi-add-support-for-HT_P600.patch | 11 ++---
 ...pmi-add-support-for-PMP8074-regulato.patch |  9 +---
 ...om-pmic-gpio-add-support-for-PMP8074.patch |  7 +--
 ...-pmic-Sort-compatibles-in-the-driver.patch |  5 ---
 ...ic-Add-missing-PMICs-supported-by-so.patch |  9 +---
 ...i-adc5-add-ADC5_VREF_VADC-to-rev2-AD.patch |  7 +--
 ...ie-make-pipe-clock-rate-configurable.patch |  7 +--
 ...e-add-IPQ8074-PCIe-Gen3-QMP-PHY-supp.patch | 17 +++----
 ...qcom-socinfo-Add-IPQ8074-family-ID-s.patch |  5 ---
 ...ve-GEN3_RELATED-DBI-register-to-comm.patch |  7 ---
 ...slot-capabilities-using-PCI_EXP_SLTC.patch |  7 +--
 ...44-v6.0-PCI-qcom-Add-IPQ60xx-support.patch | 13 ++----
 ...ts-ipq8074-add-reserved-memory-nodes.patch |  9 +---
 ...1-clk-qcom-clk-rcg2-add-rcg2-mux-ops.patch |  9 +---
 ...apss-ipq6018-fix-apcs_alias0_clk_src.patch |  7 +--
 ...q-pll-use-OF-match-data-for-Alpha-PL.patch | 11 ++---
 ...q-pll-update-IPQ6018-Alpha-PLL-confi.patch |  5 ---
 ...apss-ipq-pll-add-support-for-IPQ8074.patch |  9 +---
 ...pq8074-correct-APCS-register-space-s.patch |  7 +--
 ...64-dts-qcom-ipq8074-add-A53-PLL-node.patch |  7 +--
 ...s-ipc-add-IPQ8074-APSS-clock-support.patch |  9 +---
 ...-dts-qcom-ipq8074-add-clocks-to-APCS.patch |  7 +--
 ...11-PCI-qcom-add-IPQ8074-Gen3-support.patch |  9 +---
 ...dts-ipq8074-fix-PCI-related-DT-nodes.patch | 19 +++-----
 ...remoteproc-qcom-Add-PRNG-proxy-clock.patch | 19 +++-----
 ...moteproc-qcom-Add-secure-PIL-support.patch | 21 ++++-----
 ...Add-support-for-split-q6-m3-wlan-fir.patch | 15 +++----
 ...oc-qcom-Add-ssr-subdevice-identifier.patch |  7 +--
 ...Update-regmap-offsets-for-halt-regis.patch | 13 ++----
 ...tsens-Add-support-for-combined-inter.patch | 25 +++--------
 ...tsens-allow-configuring-min-and-max-.patch | 25 +++--------
 ...rs-thermal-tsens-add-IPQ8074-support.patch | 21 +++------
 ...-arm64-dts-ipq8074-add-thermal-nodes.patch |  9 +---
 ...om-spmi-pmic-add-support-for-PMP8074.patch |  7 +--
 ...0123-arm64-dts-qcom-add-PMP8074-DTSI.patch |  6 ---
 ...s-qcom-ipq8074-hk01-add-VQMMC-supply.patch |  7 +--
 ...0125-arm64-dts-ipq8074-add-CPU-clock.patch | 13 ++----
 ...-arm64-dts-ipq8074-add-label-to-cpus.patch |  7 +--
 ...q8074-add-cooling-cells-to-CPU-nodes.patch | 13 ++----
 ...ngs-clock-qcom-Add-reset-for-WCSSAON.patch |  5 ---
 .../0129-clk-qcom-Add-WCSSAON-reset.patch     |  7 +--
 ...c-wcss-disable-auto-boot-for-IPQ8074.patch | 11 ++---
 ...com-Enable-Q6v5-WCSS-for-ipq8074-SoC.patch | 11 ++---
 ...0132-arm64-dts-ipq8074-Add-WLAN-node.patch |  7 +--
 ...-support-for-resetting-multiple-bits.patch | 11 +----
 ...pq8074-add-missing-networking-resets.patch |  9 +---
 ...rm64-dts-ipq8074-add-label-to-clocks.patch |  7 +--
 .../0136-power-Add-Qualcomm-APM.patch         | 19 --------
 ...egulator-add-Qualcomm-CPR-regulators.patch | 27 +----------
 ...-identify-ingress-shaping-done-for-e.patch |  2 +-
 ...1000-arm64-dts-add-OpenWrt-DTS-files.patch |  7 +--
 ...com-ipq6018-Add-mdio-bus-description.patch |  7 +--
 ...om-add-support-for-hw-controlled-RCG.patch | 25 ++++-------
 ...qcom-ipq6018-add-missing-clock-flags.patch | 31 ++++++-------
 ...-clk-qcom-ipq6018-add-missing-clocks.patch | 35 +++++++--------
 ...m-ipq6018-update-Huayra-PLL-settings.patch |  9 +---
 ...orkaround-networking-clock-parenting.patch | 14 +++---
 ...com-ipq6018-Add-missing-fixed-clocks.patch |  9 +---
 ...ss-Add-ipq6018-support-in-remoteproc.patch | 11 ++---
 ...c-Add-non-secure-Q6-bringup-sequence.patch | 45 ++++++++-----------
 ...-rproc-Add-non-secure-Q6-bringup-seq.patch |  9 +---
 ...nt-advertise-OSI-support-for-IPQ6018.patch |  7 +--
 ...sm8996-Move-clock-cells-to-QMP-PHY-c.patch | 12 ++---
 ...qcom-Correct-QMP-PHY-child-node-name.patch | 14 +++---
 ...8-arm64-dts-ipq8074-add-SMEM-support.patch |  9 +---
 ...ts-ipq8074-add-reserved-memory-nodes.patch |  9 +---
 ...dd-IPQ8074-PCIe-Gen3-QMP-PHY-support.patch | 22 +++------
 ...om-ipq8074-enable-the-GICv2m-support.patch |  7 +--
 ...ve-GEN3_RELATED-DBI-register-to-comm.patch |  7 ---
 ...slot-capabilities-using-PCI_EXP_SLTC.patch |  7 +--
 .../0107-PCI-qcom-Add-IPQ60xx-support.patch   | 13 ++----
 ...08-PCI-qcom-add-IPQ8074-Gen3-support.patch |  9 +---
 ...dts-ipq8074-fix-PCI-related-DT-nodes.patch | 23 ++++------
 ...remoteproc-qcom-Add-PRNG-proxy-clock.patch | 19 +++-----
 ...moteproc-qcom-Add-secure-PIL-support.patch | 21 ++++-----
 ...Add-support-for-split-q6-m3-wlan-fir.patch | 15 +++----
 ...oc-qcom-Add-ssr-subdevice-identifier.patch |  7 +--
 ...Update-regmap-offsets-for-halt-regis.patch | 13 ++----
 ...ngs-clock-qcom-Add-reset-for-WCSSAON.patch |  5 ---
 .../0117-clk-qcom-Add-WCSSAON-reset.patch     |  7 +--
 ...c-wcss-disable-auto-boot-for-IPQ8074.patch | 11 ++---
 ...com-Enable-Q6v5-WCSS-for-ipq8074-SoC.patch | 11 ++---
 ...0120-arm64-dts-ipq8074-Add-WLAN-node.patch |  7 +--
 ...ermal-qcom-tsens-Add-IPQ8074-support.patch | 17 ++-----
 ...-arm64-dts-ipq8074-add-thermal-nodes.patch |  9 +---
 ...qcom_spmi-Add-PMD9655-SPMI-regulator.patch |  9 +---
 ...pmi-SMPS-range-is-added-to-support-P.patch |  7 +--
 ...pmi-Initialize-slew-rate-only-if-req.patch |  7 +--
 ...pmi-Add-support-for-VMPWM_CTL-subtyp.patch | 17 +++----
 ...dhc-Fixed-SDR104-mode-card-detection.patch |  9 +---
 ...ulator-Add-separate-voltage-range-fo.patch |  9 +---
 ...dts-ipq8074-add-SPMI-PMIC-regulators.patch |  7 +--
 ...k-alpha-pll-add-support-for-APSS-PLL.patch |  9 +---
 ...bindings-for-IPQ8074-APSS-clock-cont.patch |  6 ---
 ...om-Add-IPQ8074-APSS-clock-controller.patch | 12 +----
 ...s-ipc-add-IPQ8074-APSS-clock-control.patch |  9 +---
 ...4-update-APCS-node-due-to-clock-supp.patch |  7 +--
 ...-ipq8074-add-CPU-clock-and-regulator.patch | 13 ++----
 ...-arm64-dts-ipq8074-add-label-to-cpus.patch |  7 +--
 ...q8074-add-cooling-cells-to-CPU-nodes.patch | 13 ++----
 ...-support-for-resetting-multiple-bits.patch | 11 +----
 ...pq8074-add-missing-networking-resets.patch |  9 +---
 ...q8074-disable-USB-GDSC-s-SW_COLLAPSE.patch | 11 ++---
 ...074-SW-workaround-for-UBI32-PLL-lock.patch |  7 +--
 ...lk-qcom-ipq8074-add-PPE-crypto-clock.patch | 11 +----
 ...egulator-add-Qualcomm-CPR-regulators.patch |  9 +---
 .../0301-power-Add-Qualcomm-APM.patch         |  7 ---
 ...-identify-ingress-shaping-done-for-e.patch |  2 +-
 ...rm64-dts-ipq8074-add-label-to-clocks.patch |  9 +---
 .../patches-5.15/410-bt-mtk-serial-fix.patch  |  2 +-
 ...IPS-ralink-add-sdhci-for-mt7620a-SoC.patch |  2 +-
 ...-use-3.0-clock-when-operating-in-2.0.patch |  4 +-
 ...dd-support-for-Motorcomm-yt8531C-phy.patch |  6 +--
 ...399-add-support-for-Rongpin-King3399.patch |  4 +-
 166 files changed, 419 insertions(+), 1210 deletions(-)
 mode change 100755 => 100644 target/linux/rockchip/patches-5.15/211-rockchip-rk3399-add-support-for-Rongpin-King3399.patch

diff --git a/include/kernel-5.15 b/include/kernel-5.15
index dc199a656..d5dcb1134 100644
--- a/include/kernel-5.15
+++ b/include/kernel-5.15
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .76
-LINUX_KERNEL_HASH-5.15.76 = 9007a020c419e3625b980e361be09f70ebd99e156ccb66129a981483d065d57f
+LINUX_VERSION-5.15 = .77
+LINUX_KERNEL_HASH-5.15.77 = 142f841f33796a84c62fae2f2b96d2120bd8bbf9e0aac4ce157692cdb0afe9f9
diff --git a/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch
index a7c5d95f4..e398bca9b 100644
--- a/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch
+++ b/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch
@@ -706,7 +706,7 @@
  EXPORT_SYMBOL(xfrm_parse_spi);
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -4151,14 +4151,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -4152,14 +4152,16 @@ static bool tcp_parse_aligned_timestamp(
  {
  	const __be32 *ptr = (const __be32 *)(th + 1);
  
diff --git a/target/linux/bcm27xx/patches-5.15/950-0070-MMC-added-alternative-MMC-driver.patch b/target/linux/bcm27xx/patches-5.15/950-0070-MMC-added-alternative-MMC-driver.patch
index 754b63396..454808300 100644
--- a/target/linux/bcm27xx/patches-5.15/950-0070-MMC-added-alternative-MMC-driver.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0070-MMC-added-alternative-MMC-driver.patch
@@ -230,7 +230,7 @@ bcm2835-mmc: uninitialized_var is no more
 
 --- a/drivers/mmc/core/block.c
 +++ b/drivers/mmc/core/block.c
-@@ -171,6 +171,13 @@ static DEFINE_MUTEX(open_lock);
+@@ -172,6 +172,13 @@ static DEFINE_MUTEX(open_lock);
  module_param(perdev_minors, int, 0444);
  MODULE_PARM_DESC(perdev_minors, "Minors numbers to allocate per device");
  
@@ -244,7 +244,7 @@ bcm2835-mmc: uninitialized_var is no more
  static inline int mmc_blk_part_switch(struct mmc_card *card,
  				      unsigned int part_type);
  static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
-@@ -2928,6 +2935,8 @@ static int mmc_blk_probe(struct mmc_card
+@@ -2936,6 +2943,8 @@ static int mmc_blk_probe(struct mmc_card
  {
  	struct mmc_blk_data *md;
  	int ret = 0;
@@ -253,7 +253,7 @@ bcm2835-mmc: uninitialized_var is no more
  
  	/*
  	 * Check that the card supports the command class(es) we need.
-@@ -2935,7 +2944,16 @@ static int mmc_blk_probe(struct mmc_card
+@@ -2943,7 +2952,16 @@ static int mmc_blk_probe(struct mmc_card
  	if (!(card->csd.cmdclass & CCC_BLOCK_READ))
  		return -ENODEV;
  
@@ -271,7 +271,7 @@ bcm2835-mmc: uninitialized_var is no more
  
  	card->complete_wq = alloc_workqueue("mmc_complete",
  					WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);
-@@ -2950,6 +2968,17 @@ static int mmc_blk_probe(struct mmc_card
+@@ -2958,6 +2976,17 @@ static int mmc_blk_probe(struct mmc_card
  		goto out_free;
  	}
  
diff --git a/target/linux/bcm27xx/patches-5.15/950-0152-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch b/target/linux/bcm27xx/patches-5.15/950-0152-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch
index 85f3e610a..aa12dae1f 100644
--- a/target/linux/bcm27xx/patches-5.15/950-0152-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0152-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch
@@ -15,7 +15,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
 
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
-@@ -1612,6 +1612,109 @@ command_cleanup:
+@@ -1618,6 +1618,109 @@ command_cleanup:
  }
  
  /*
@@ -125,7 +125,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
   * non-error returns are a promise to giveback() the urb later
   * we drop ownership so next owner (or urb unlink) can get it
   */
-@@ -5437,6 +5540,7 @@ static const struct hc_driver xhci_hc_dr
+@@ -5443,6 +5546,7 @@ static const struct hc_driver xhci_hc_dr
  	.endpoint_reset =	xhci_endpoint_reset,
  	.check_bandwidth =	xhci_check_bandwidth,
  	.reset_bandwidth =	xhci_reset_bandwidth,
diff --git a/target/linux/bcm27xx/patches-5.15/950-0166-xhci-Use-more-event-ring-segment-table-entries.patch b/target/linux/bcm27xx/patches-5.15/950-0166-xhci-Use-more-event-ring-segment-table-entries.patch
index b3f8240db..b3ad56722 100644
--- a/target/linux/bcm27xx/patches-5.15/950-0166-xhci-Use-more-event-ring-segment-table-entries.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0166-xhci-Use-more-event-ring-segment-table-entries.patch
@@ -22,7 +22,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
 
 --- a/drivers/usb/host/xhci-mem.c
 +++ b/drivers/usb/host/xhci-mem.c
-@@ -2516,9 +2516,11 @@ int xhci_mem_init(struct xhci_hcd *xhci,
+@@ -2520,9 +2520,11 @@ int xhci_mem_init(struct xhci_hcd *xhci,
  	 * Event ring setup: Allocate a normal ring, but also setup
  	 * the event ring segment table (ERST).  Section 4.9.3.
  	 */
@@ -36,7 +36,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  	if (!xhci->event_ring)
  		goto fail;
  	if (xhci_check_trb_in_td_math(xhci) < 0)
-@@ -2531,7 +2533,7 @@ int xhci_mem_init(struct xhci_hcd *xhci,
+@@ -2535,7 +2537,7 @@ int xhci_mem_init(struct xhci_hcd *xhci,
  	/* set ERST count with the number of entries in the segment table */
  	val = readl(&xhci->ir_set->erst_size);
  	val &= ERST_SIZE_MASK;
diff --git a/target/linux/bcm27xx/patches-5.15/950-0464-videodev2.h-add-V4L2_CTRL_FLAG_DYNAMIC_ARRAY.patch b/target/linux/bcm27xx/patches-5.15/950-0464-videodev2.h-add-V4L2_CTRL_FLAG_DYNAMIC_ARRAY.patch
index 58e32d993..67137dd69 100644
--- a/target/linux/bcm27xx/patches-5.15/950-0464-videodev2.h-add-V4L2_CTRL_FLAG_DYNAMIC_ARRAY.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0464-videodev2.h-add-V4L2_CTRL_FLAG_DYNAMIC_ARRAY.patch
@@ -42,7 +42,7 @@ Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
  ============
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
-@@ -1882,6 +1882,7 @@ struct v4l2_querymenu {
+@@ -1883,6 +1883,7 @@ struct v4l2_querymenu {
  #define V4L2_CTRL_FLAG_HAS_PAYLOAD	0x0100
  #define V4L2_CTRL_FLAG_EXECUTE_ON_WRITE	0x0200
  #define V4L2_CTRL_FLAG_MODIFY_LAYOUT	0x0400
diff --git a/target/linux/bcm27xx/patches-5.15/950-0600-xhci-quirks-add-link-TRB-quirk-for-VL805.patch b/target/linux/bcm27xx/patches-5.15/950-0600-xhci-quirks-add-link-TRB-quirk-for-VL805.patch
index 6c2840d63..dc946b1c6 100644
--- a/target/linux/bcm27xx/patches-5.15/950-0600-xhci-quirks-add-link-TRB-quirk-for-VL805.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0600-xhci-quirks-add-link-TRB-quirk-for-VL805.patch
@@ -22,7 +22,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
 
 --- a/drivers/usb/host/xhci-pci.c
 +++ b/drivers/usb/host/xhci-pci.c
-@@ -304,6 +304,7 @@ static void xhci_pci_quirks(struct devic
+@@ -291,6 +291,7 @@ static void xhci_pci_quirks(struct devic
  	if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483) {
  		xhci->quirks |= XHCI_LPM_SUPPORT;
  		xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS;
@@ -50,11 +50,11 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
  	addr = xhci_trb_virt_to_dma(new_seg, new_deq);
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
-@@ -1904,6 +1904,7 @@ struct xhci_hcd {
- #define XHCI_BROKEN_D3COLD	BIT_ULL(41)
+@@ -1905,6 +1905,7 @@ struct xhci_hcd {
  #define XHCI_EP_CTX_BROKEN_DCS	BIT_ULL(42)
  #define XHCI_SUSPEND_RESUME_CLKS	BIT_ULL(43)
-+#define XHCI_AVOID_DQ_ON_LINK	BIT_ULL(44)
+ #define XHCI_RESET_TO_DEFAULT	BIT_ULL(44)
++#define XHCI_AVOID_DQ_ON_LINK	BIT_ULL(45)
  
  	unsigned int		num_active_eps;
  	unsigned int		limit_active_eps;
diff --git a/target/linux/bcm27xx/patches-5.15/950-0605-xhci-refactor-out-TRBS_PER_SEGMENT-define-in-runtime.patch b/target/linux/bcm27xx/patches-5.15/950-0605-xhci-refactor-out-TRBS_PER_SEGMENT-define-in-runtime.patch
index 2b7435368..f9907cc82 100644
--- a/target/linux/bcm27xx/patches-5.15/950-0605-xhci-refactor-out-TRBS_PER_SEGMENT-define-in-runtime.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0605-xhci-refactor-out-TRBS_PER_SEGMENT-define-in-runtime.patch
@@ -145,7 +145,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
  	if (ret)
  		return -ENOMEM;
  
-@@ -1816,7 +1820,7 @@ int xhci_alloc_erst(struct xhci_hcd *xhc
+@@ -1820,7 +1824,7 @@ int xhci_alloc_erst(struct xhci_hcd *xhc
  	for (val = 0; val < evt_ring->num_segs; val++) {
  		entry = &erst->entries[val];
  		entry->seg_addr = cpu_to_le64(seg->dma);
@@ -226,7 +226,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
  	}
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
-@@ -870,8 +870,8 @@ static void xhci_clear_command_ring(stru
+@@ -876,8 +876,8 @@ static void xhci_clear_command_ring(stru
  	seg = ring->deq_seg;
  	do {
  		memset(seg->trbs, 0,
@@ -237,7 +237,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
  			cpu_to_le32(~TRB_CYCLE);
  		seg = seg->next;
  	} while (seg != ring->deq_seg);
-@@ -882,7 +882,7 @@ static void xhci_clear_command_ring(stru
+@@ -888,7 +888,7 @@ static void xhci_clear_command_ring(stru
  	ring->enq_seg = ring->deq_seg;
  	ring->enqueue = ring->dequeue;
  
diff --git a/target/linux/bcm27xx/patches-5.15/950-0606-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch b/target/linux/bcm27xx/patches-5.15/950-0606-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch
index 39ddab76e..4d477eb4e 100644
--- a/target/linux/bcm27xx/patches-5.15/950-0606-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0606-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch
@@ -53,7 +53,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
  			cycle_state, type, max_packet, flags);
 --- a/drivers/usb/host/xhci-pci.c
 +++ b/drivers/usb/host/xhci-pci.c
-@@ -305,6 +305,7 @@ static void xhci_pci_quirks(struct devic
+@@ -292,6 +292,7 @@ static void xhci_pci_quirks(struct devic
  		xhci->quirks |= XHCI_LPM_SUPPORT;
  		xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS;
  		xhci->quirks |= XHCI_AVOID_DQ_ON_LINK;
@@ -63,11 +63,11 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
  	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
-@@ -1906,6 +1906,7 @@ struct xhci_hcd {
- #define XHCI_EP_CTX_BROKEN_DCS	BIT_ULL(42)
+@@ -1907,6 +1907,7 @@ struct xhci_hcd {
  #define XHCI_SUSPEND_RESUME_CLKS	BIT_ULL(43)
- #define XHCI_AVOID_DQ_ON_LINK	BIT_ULL(44)
-+#define XHCI_VLI_TRB_CACHE_BUG	BIT_ULL(45)
+ #define XHCI_RESET_TO_DEFAULT	BIT_ULL(44)
+ #define XHCI_AVOID_DQ_ON_LINK	BIT_ULL(45)
++#define XHCI_VLI_TRB_CACHE_BUG	BIT_ULL(46)
  
  	unsigned int		num_active_eps;
  	unsigned int		limit_active_eps;
diff --git a/target/linux/bcm27xx/patches-5.15/950-0717-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch b/target/linux/bcm27xx/patches-5.15/950-0717-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch
index ab68debd2..372ec6f8e 100644
--- a/target/linux/bcm27xx/patches-5.15/950-0717-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0717-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch
@@ -26,7 +26,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
 
 --- a/drivers/usb/host/xhci-pci.c
 +++ b/drivers/usb/host/xhci-pci.c
-@@ -306,6 +306,7 @@ static void xhci_pci_quirks(struct devic
+@@ -293,6 +293,7 @@ static void xhci_pci_quirks(struct devic
  		xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS;
  		xhci->quirks |= XHCI_AVOID_DQ_ON_LINK;
  		xhci->quirks |= XHCI_VLI_TRB_CACHE_BUG;
@@ -86,11 +86,11 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
  			first_trb = false;
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
-@@ -1907,6 +1907,7 @@ struct xhci_hcd {
- #define XHCI_SUSPEND_RESUME_CLKS	BIT_ULL(43)
- #define XHCI_AVOID_DQ_ON_LINK	BIT_ULL(44)
- #define XHCI_VLI_TRB_CACHE_BUG	BIT_ULL(45)
-+#define XHCI_VLI_SS_BULK_OUT_BUG	BIT_ULL(46)
+@@ -1908,6 +1908,7 @@ struct xhci_hcd {
+ #define XHCI_RESET_TO_DEFAULT	BIT_ULL(44)
+ #define XHCI_AVOID_DQ_ON_LINK	BIT_ULL(45)
+ #define XHCI_VLI_TRB_CACHE_BUG	BIT_ULL(46)
++#define XHCI_VLI_SS_BULK_OUT_BUG	BIT_ULL(47)
  
  	unsigned int		num_active_eps;
  	unsigned int		limit_active_eps;
diff --git a/target/linux/bcm27xx/patches-5.15/950-0914-mmc-block-Don-t-do-single-sector-reads-during-recove.patch b/target/linux/bcm27xx/patches-5.15/950-0914-mmc-block-Don-t-do-single-sector-reads-during-recove.patch
index 7390813f3..5e491a6f5 100644
--- a/target/linux/bcm27xx/patches-5.15/950-0914-mmc-block-Don-t-do-single-sector-reads-during-recove.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0914-mmc-block-Don-t-do-single-sector-reads-during-recove.patch
@@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
 
 --- a/drivers/mmc/core/block.c
 +++ b/drivers/mmc/core/block.c
-@@ -1875,7 +1875,11 @@ static void mmc_blk_mq_rw_recovery(struc
+@@ -1883,7 +1883,11 @@ static void mmc_blk_mq_rw_recovery(struc
  		return;
  	}
  
diff --git a/target/linux/bcm53xx/patches-5.15/180-usb-xhci-add-support-for-performing-fake-doorbell.patch b/target/linux/bcm53xx/patches-5.15/180-usb-xhci-add-support-for-performing-fake-doorbell.patch
index 239c140c9..69d70aefa 100644
--- a/target/linux/bcm53xx/patches-5.15/180-usb-xhci-add-support-for-performing-fake-doorbell.patch
+++ b/target/linux/bcm53xx/patches-5.15/180-usb-xhci-add-support-for-performing-fake-doorbell.patch
@@ -127,11 +127,11 @@ it on BCM4708 family.
  /*
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
-@@ -1904,6 +1904,7 @@ struct xhci_hcd {
- #define XHCI_BROKEN_D3COLD	BIT_ULL(41)
+@@ -1905,6 +1905,7 @@ struct xhci_hcd {
  #define XHCI_EP_CTX_BROKEN_DCS	BIT_ULL(42)
  #define XHCI_SUSPEND_RESUME_CLKS	BIT_ULL(43)
-+#define XHCI_FAKE_DOORBELL	BIT_ULL(44)
+ #define XHCI_RESET_TO_DEFAULT	BIT_ULL(44)
++#define XHCI_FAKE_DOORBELL	BIT_ULL(45)
  
  	unsigned int		num_active_eps;
  	unsigned int		limit_active_eps;
diff --git a/target/linux/generic/backport-5.15/850-v5.17-0007-PCI-aardvark-Mask-all-interrupts-when-unbinding-driv.patch b/target/linux/generic/backport-5.15/850-v5.17-0007-PCI-aardvark-Mask-all-interrupts-when-unbinding-driv.patch
index 2d9e6ce51..dfccf264e 100644
--- a/target/linux/generic/backport-5.15/850-v5.17-0007-PCI-aardvark-Mask-all-interrupts-when-unbinding-driv.patch
+++ b/target/linux/generic/backport-5.15/850-v5.17-0007-PCI-aardvark-Mask-all-interrupts-when-unbinding-driv.patch
@@ -18,7 +18,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1889,6 +1889,27 @@ static int advk_pcie_remove(struct platf
+@@ -1887,6 +1887,27 @@ static int advk_pcie_remove(struct platf
  	advk_writel(pcie, PCIE_ISR1_ALL_MASK, PCIE_ISR1_REG);
  	advk_writel(pcie, PCIE_IRQ_ALL_MASK, HOST_CTRL_INT_STATUS_REG);
  
diff --git a/target/linux/generic/backport-5.15/850-v5.17-0008-PCI-aardvark-Fix-memory-leak-in-driver-unbind.patch b/target/linux/generic/backport-5.15/850-v5.17-0008-PCI-aardvark-Fix-memory-leak-in-driver-unbind.patch
index 53b9bd31c..7276d4802 100644
--- a/target/linux/generic/backport-5.15/850-v5.17-0008-PCI-aardvark-Fix-memory-leak-in-driver-unbind.patch
+++ b/target/linux/generic/backport-5.15/850-v5.17-0008-PCI-aardvark-Fix-memory-leak-in-driver-unbind.patch
@@ -21,7 +21,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1927,6 +1927,9 @@ static int advk_pcie_remove(struct platf
+@@ -1925,6 +1925,9 @@ static int advk_pcie_remove(struct platf
  	val &= ~LINK_TRAINING_EN;
  	advk_writel(pcie, val, PCIE_CORE_CTRL0_REG);
  
diff --git a/target/linux/generic/backport-5.15/850-v5.17-0009-PCI-aardvark-Assert-PERST-when-unbinding-driver.patch b/target/linux/generic/backport-5.15/850-v5.17-0009-PCI-aardvark-Assert-PERST-when-unbinding-driver.patch
index 9610d4abd..0b740e119 100644
--- a/target/linux/generic/backport-5.15/850-v5.17-0009-PCI-aardvark-Assert-PERST-when-unbinding-driver.patch
+++ b/target/linux/generic/backport-5.15/850-v5.17-0009-PCI-aardvark-Assert-PERST-when-unbinding-driver.patch
@@ -20,7 +20,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1930,6 +1930,10 @@ static int advk_pcie_remove(struct platf
+@@ -1928,6 +1928,10 @@ static int advk_pcie_remove(struct platf
  	/* Free config space for emulated root bridge */
  	pci_bridge_emul_cleanup(&pcie->bridge);
  
diff --git a/target/linux/generic/backport-5.15/850-v5.17-0010-PCI-aardvark-Disable-link-training-when-unbinding-dr.patch b/target/linux/generic/backport-5.15/850-v5.17-0010-PCI-aardvark-Disable-link-training-when-unbinding-dr.patch
index 5ad0c1073..fcda4e60e 100644
--- a/target/linux/generic/backport-5.15/850-v5.17-0010-PCI-aardvark-Disable-link-training-when-unbinding-dr.patch
+++ b/target/linux/generic/backport-5.15/850-v5.17-0010-PCI-aardvark-Disable-link-training-when-unbinding-dr.patch
@@ -20,7 +20,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1934,6 +1934,11 @@ static int advk_pcie_remove(struct platf
+@@ -1932,6 +1932,11 @@ static int advk_pcie_remove(struct platf
  	if (pcie->reset_gpio)
  		gpiod_set_value_cansleep(pcie->reset_gpio, 1);
  
diff --git a/target/linux/generic/backport-5.15/850-v5.17-0011-PCI-aardvark-Disable-common-PHY-when-unbinding-drive.patch b/target/linux/generic/backport-5.15/850-v5.17-0011-PCI-aardvark-Disable-common-PHY-when-unbinding-drive.patch
index 1c725be06..43b548c34 100644
--- a/target/linux/generic/backport-5.15/850-v5.17-0011-PCI-aardvark-Disable-common-PHY-when-unbinding-drive.patch
+++ b/target/linux/generic/backport-5.15/850-v5.17-0011-PCI-aardvark-Disable-common-PHY-when-unbinding-drive.patch
@@ -18,7 +18,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1649,6 +1649,9 @@ static int advk_pcie_enable_phy(struct a
+@@ -1647,6 +1647,9 @@ static int advk_pcie_enable_phy(struct a
  		return ret;
  	}
  
diff --git a/target/linux/generic/hack-5.15/661-use_fq_codel_by_default.patch b/target/linux/generic/hack-5.15/661-use_fq_codel_by_default.patch
index 0d27b7eb1..1ea496f99 100644
--- a/target/linux/generic/hack-5.15/661-use_fq_codel_by_default.patch
+++ b/target/linux/generic/hack-5.15/661-use_fq_codel_by_default.patch
@@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	  device, it has to decide which ones to send first, which ones to
 --- a/net/sched/sch_api.c
 +++ b/net/sched/sch_api.c
-@@ -2285,7 +2285,7 @@ static int __init pktsched_init(void)
+@@ -2286,7 +2286,7 @@ static int __init pktsched_init(void)
  		return err;
  	}
  
@@ -55,7 +55,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	register_qdisc(&pfifo_head_drop_qdisc_ops);
 --- a/net/sched/sch_fq_codel.c
 +++ b/net/sched/sch_fq_codel.c
-@@ -709,7 +709,7 @@ static const struct Qdisc_class_ops fq_c
+@@ -707,7 +707,7 @@ static const struct Qdisc_class_ops fq_c
  	.walk		=	fq_codel_walk,
  };
  
@@ -64,7 +64,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	.cl_ops		=	&fq_codel_class_ops,
  	.id		=	"fq_codel",
  	.priv_size	=	sizeof(struct fq_codel_sched_data),
-@@ -724,6 +724,7 @@ static struct Qdisc_ops fq_codel_qdisc_o
+@@ -722,6 +722,7 @@ static struct Qdisc_ops fq_codel_qdisc_o
  	.dump_stats =	fq_codel_dump_stats,
  	.owner		=	THIS_MODULE,
  };
diff --git a/target/linux/generic/hack-5.15/952-add-net-conntrack-events-support-multiple-registrant.patch b/target/linux/generic/hack-5.15/952-add-net-conntrack-events-support-multiple-registrant.patch
index 5ee2db9a1..4aaf92f5b 100644
--- a/target/linux/generic/hack-5.15/952-add-net-conntrack-events-support-multiple-registrant.patch
+++ b/target/linux/generic/hack-5.15/952-add-net-conntrack-events-support-multiple-registrant.patch
@@ -110,7 +110,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
  	depends on NETFILTER_ADVANCED
 --- a/net/netfilter/nf_conntrack_core.c
 +++ b/net/netfilter/nf_conntrack_core.c
-@@ -2878,6 +2878,10 @@ int nf_conntrack_init_net(struct net *ne
+@@ -2886,6 +2886,10 @@ int nf_conntrack_init_net(struct net *ne
  	nf_conntrack_helper_pernet_init(net);
  	nf_conntrack_proto_pernet_init(net);
  
diff --git a/target/linux/generic/hack-5.15/953-net-patch-linux-kernel-to-support-shortcut-fe.patch b/target/linux/generic/hack-5.15/953-net-patch-linux-kernel-to-support-shortcut-fe.patch
index 6e8792433..b319e6f51 100644
--- a/target/linux/generic/hack-5.15/953-net-patch-linux-kernel-to-support-shortcut-fe.patch
+++ b/target/linux/generic/hack-5.15/953-net-patch-linux-kernel-to-support-shortcut-fe.patch
@@ -12,9 +12,9 @@
  			       struct list_head *br_ip_list);
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -913,6 +913,10 @@ struct sk_buff {
- #endif
+@@ -915,6 +915,10 @@ struct sk_buff {
  	__u8			slow_gro:1;
+ 	__u8			scm_io_uring:1;
  
 +#ifdef CONFIG_SHORTCUT_FE
 +	__u8			fast_forwarded:1;
diff --git a/target/linux/generic/pending-5.15/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch b/target/linux/generic/pending-5.15/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
index 09efa1e72..2f6fbd59e 100644
--- a/target/linux/generic/pending-5.15/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
+++ b/target/linux/generic/pending-5.15/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
@@ -338,7 +338,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
  	if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6))
  		return -1;
  
-@@ -1525,6 +1686,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
+@@ -1526,6 +1687,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
  	t->parms.link = p->link;
  	t->parms.proto = p->proto;
  	t->parms.fwmark = p->fwmark;
@@ -353,7 +353,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
  	dst_cache_reset(&t->dst_cache);
  	ip6_tnl_link_config(t);
  	return 0;
-@@ -1563,6 +1732,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
+@@ -1564,6 +1733,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
  	p->flowinfo = u->flowinfo;
  	p->link = u->link;
  	p->proto = u->proto;
@@ -361,7 +361,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
  	memcpy(p->name, u->name, sizeof(u->name));
  }
  
-@@ -1949,6 +2119,15 @@ static int ip6_tnl_validate(struct nlatt
+@@ -1950,6 +2120,15 @@ static int ip6_tnl_validate(struct nlatt
  	return 0;
  }
  
@@ -377,7 +377,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
  static void ip6_tnl_netlink_parms(struct nlattr *data[],
  				  struct __ip6_tnl_parm *parms)
  {
-@@ -1986,6 +2165,46 @@ static void ip6_tnl_netlink_parms(struct
+@@ -1987,6 +2166,46 @@ static void ip6_tnl_netlink_parms(struct
  
  	if (data[IFLA_IPTUN_FWMARK])
  		parms->fwmark = nla_get_u32(data[IFLA_IPTUN_FWMARK]);
@@ -424,7 +424,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
  }
  
  static bool ip6_tnl_netlink_encap_parms(struct nlattr *data[],
-@@ -2101,6 +2320,12 @@ static void ip6_tnl_dellink(struct net_d
+@@ -2102,6 +2321,12 @@ static void ip6_tnl_dellink(struct net_d
  
  static size_t ip6_tnl_get_size(const struct net_device *dev)
  {
@@ -437,7 +437,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
  	return
  		/* IFLA_IPTUN_LINK */
  		nla_total_size(4) +
-@@ -2130,6 +2355,24 @@ static size_t ip6_tnl_get_size(const str
+@@ -2131,6 +2356,24 @@ static size_t ip6_tnl_get_size(const str
  		nla_total_size(0) +
  		/* IFLA_IPTUN_FWMARK */
  		nla_total_size(4) +
@@ -462,7 +462,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
  		0;
  }
  
-@@ -2137,6 +2380,9 @@ static int ip6_tnl_fill_info(struct sk_b
+@@ -2138,6 +2381,9 @@ static int ip6_tnl_fill_info(struct sk_b
  {
  	struct ip6_tnl *tunnel = netdev_priv(dev);
  	struct __ip6_tnl_parm *parm = &tunnel->parms;
@@ -472,7 +472,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
  
  	if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) ||
  	    nla_put_in6_addr(skb, IFLA_IPTUN_LOCAL, &parm->laddr) ||
-@@ -2146,9 +2392,27 @@ static int ip6_tnl_fill_info(struct sk_b
+@@ -2147,9 +2393,27 @@ static int ip6_tnl_fill_info(struct sk_b
  	    nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) ||
  	    nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||
  	    nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto) ||
@@ -501,7 +501,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
  	if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE, tunnel->encap.type) ||
  	    nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT, tunnel->encap.sport) ||
  	    nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT, tunnel->encap.dport) ||
-@@ -2188,6 +2452,7 @@ static const struct nla_policy ip6_tnl_p
+@@ -2189,6 +2453,7 @@ static const struct nla_policy ip6_tnl_p
  	[IFLA_IPTUN_ENCAP_DPORT]	= { .type = NLA_U16 },
  	[IFLA_IPTUN_COLLECT_METADATA]	= { .type = NLA_FLAG },
  	[IFLA_IPTUN_FWMARK]		= { .type = NLA_U32 },
diff --git a/target/linux/ipq60xx/patches-5.15/0001-v5.16-arm64-dts-qcom-ipq8074-add-SPMI-bus.patch b/target/linux/ipq60xx/patches-5.15/0001-v5.16-arm64-dts-qcom-ipq8074-add-SPMI-bus.patch
index 1da0d2916..9ff451e01 100644
--- a/target/linux/ipq60xx/patches-5.15/0001-v5.16-arm64-dts-qcom-ipq8074-add-SPMI-bus.patch
+++ b/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/20210905165816.655275-1-robimarko@gmail.com
  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
-
diff --git a/target/linux/ipq60xx/patches-5.15/0002-v5.16-arm64-dts-qcom-Update-BAM-DMA-node-name-per-DT-schem.patch b/target/linux/ipq60xx/patches-5.15/0002-v5.16-arm64-dts-qcom-Update-BAM-DMA-node-name-per-DT-schem.patch
index 8b48317d3..1095739d9 100644
--- a/target/linux/ipq60xx/patches-5.15/0002-v5.16-arm64-dts-qcom-Update-BAM-DMA-node-name-per-DT-schem.patch
+++ b/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/20210831052325.21229-1-shawn.guo@linaro.org
  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
-
diff --git a/target/linux/ipq60xx/patches-5.15/0003-v5.16-arm64-dts-qcom-ipq8074-Add-QUP5-I2C-node.patch b/target/linux/ipq60xx/patches-5.15/0003-v5.16-arm64-dts-qcom-ipq8074-Add-QUP5-I2C-node.patch
index 27e3824d6..0bd4a9109 100644
--- a/target/linux/ipq60xx/patches-5.15/0003-v5.16-arm64-dts-qcom-ipq8074-Add-QUP5-I2C-node.patch
+++ b/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/20211001145421.18302-1-amadeus@jmu.edu.cn
  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
-
diff --git a/target/linux/ipq60xx/patches-5.15/0004-v5.16-arm64-dts-qcom-msm8996-Move-clock-cells-to-QMP-PHY-c.patch b/target/linux/ipq60xx/patches-5.15/0004-v5.16-arm64-dts-qcom-msm8996-Move-clock-cells-to-QMP-PHY-c.patch
index b3aa15bb4..a278a3e4a 100644
--- a/target/linux/ipq60xx/patches-5.15/0004-v5.16-arm64-dts-qcom-msm8996-Move-clock-cells-to-QMP-PHY-c.patch
+++ b/target/linux/ipq60xx/patches-5.15/0004-v5.16-arm64-dts-qcom-msm8996-Move-clock-cells-to-QMP-PHY-c.patch
@@ -17,11 +17,9 @@ Link: https://lore.kernel.org/r/20210929034253.24570-4-shawn.guo@linaro.org
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 9e700963a1e3..69ce2dd644ab 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -91,7 +91,6 @@ soc: soc {
+@@ -91,7 +91,6 @@
  		ssphy_1: phy@58000 {
  			compatible = "qcom,ipq8074-qmp-usb3-phy";
  			reg = <0x00058000 0x1c4>;
@@ -29,7 +27,7 @@ index 9e700963a1e3..69ce2dd644ab 100644
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges;
-@@ -112,6 +111,7 @@ usb1_ssphy: lane@58200 {
+@@ -112,6 +111,7 @@
  				      <0x00058800 0x1f8>,     /* PCS  */
  				      <0x00058600 0x044>;     /* PCS misc*/
  				#phy-cells = <0>;
@@ -37,7 +35,7 @@ index 9e700963a1e3..69ce2dd644ab 100644
  				clocks = <&gcc GCC_USB1_PIPE_CLK>;
  				clock-names = "pipe0";
  				clock-output-names = "gcc_usb1_pipe_clk_src";
-@@ -134,7 +134,6 @@ qusb_phy_1: phy@59000 {
+@@ -134,7 +134,6 @@
  		ssphy_0: phy@78000 {
  			compatible = "qcom,ipq8074-qmp-usb3-phy";
  			reg = <0x00078000 0x1c4>;
@@ -45,7 +43,7 @@ index 9e700963a1e3..69ce2dd644ab 100644
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges;
-@@ -155,6 +154,7 @@ usb0_ssphy: lane@78200 {
+@@ -155,6 +154,7 @@
  				      <0x00078800 0x1f8>,     /* PCS  */
  				      <0x00078600 0x044>;     /* PCS misc*/
  				#phy-cells = <0>;
@@ -53,6 +51,3 @@ index 9e700963a1e3..69ce2dd644ab 100644
  				clocks = <&gcc GCC_USB0_PIPE_CLK>;
  				clock-names = "pipe0";
  				clock-output-names = "gcc_usb0_pipe_clk_src";
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0005-v5.16-arm64-dts-qcom-Correct-QMP-PHY-child-node-name.patch b/target/linux/ipq60xx/patches-5.15/0005-v5.16-arm64-dts-qcom-Correct-QMP-PHY-child-node-name.patch
index 1cc27a763..3e76abe96 100644
--- a/target/linux/ipq60xx/patches-5.15/0005-v5.16-arm64-dts-qcom-Correct-QMP-PHY-child-node-name.patch
+++ b/target/linux/ipq60xx/patches-5.15/0005-v5.16-arm64-dts-qcom-Correct-QMP-PHY-child-node-name.patch
@@ -23,11 +23,9 @@ Link: https://lore.kernel.org/r/20210929034253.24570-5-shawn.guo@linaro.org
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 69ce2dd644ab..56c1b4cfc6ba 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -105,7 +105,7 @@ ssphy_1: phy@58000 {
+@@ -105,7 +105,7 @@
  			reset-names = "phy","common";
  			status = "disabled";
  
@@ -36,7 +34,7 @@ index 69ce2dd644ab..56c1b4cfc6ba 100644
  				reg = <0x00058200 0x130>,       /* Tx */
  				      <0x00058400 0x200>,     /* Rx */
  				      <0x00058800 0x1f8>,     /* PCS  */
-@@ -148,7 +148,7 @@ ssphy_0: phy@78000 {
+@@ -148,7 +148,7 @@
  			reset-names = "phy","common";
  			status = "disabled";
  
@@ -45,6 +43,3 @@ index 69ce2dd644ab..56c1b4cfc6ba 100644
  				reg = <0x00078200 0x130>,       /* Tx */
  				      <0x00078400 0x200>,     /* Rx */
  				      <0x00078800 0x1f8>,     /* PCS  */
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0006-v5.16-arm64-dts-qcom-Fix-IPQ8074-PCIe-PHY-nodes.patch b/target/linux/ipq60xx/patches-5.15/0006-v5.16-arm64-dts-qcom-Fix-IPQ8074-PCIe-PHY-nodes.patch
index bbad2303a..6aff21f28 100644
--- a/target/linux/ipq60xx/patches-5.15/0006-v5.16-arm64-dts-qcom-Fix-IPQ8074-PCIe-PHY-nodes.patch
+++ b/target/linux/ipq60xx/patches-5.15/0006-v5.16-arm64-dts-qcom-Fix-IPQ8074-PCIe-PHY-nodes.patch
@@ -19,11 +19,9 @@ Link: https://lore.kernel.org/r/20210929034253.24570-9-shawn.guo@linaro.org
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 46 +++++++++++++++++++++------
  1 file changed, 36 insertions(+), 10 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 56c1b4cfc6ba..4512fcac0f9a 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -174,34 +174,60 @@ qusb_phy_0: phy@79000 {
+@@ -174,34 +174,60 @@
  			status = "disabled";
  		};
  
@@ -94,6 +92,3 @@ index 56c1b4cfc6ba..4512fcac0f9a 100644
  		};
  
  		prng: rng@e3000 {
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0007-v5.17-arm64-dts-qcom-ipq8074-add-MDIO-bus.patch b/target/linux/ipq60xx/patches-5.15/0007-v5.17-arm64-dts-qcom-ipq8074-add-MDIO-bus.patch
index 00f9640b2..26f27ff79 100644
--- a/target/linux/ipq60xx/patches-5.15/0007-v5.17-arm64-dts-qcom-ipq8074-add-MDIO-bus.patch
+++ b/target/linux/ipq60xx/patches-5.15/0007-v5.17-arm64-dts-qcom-ipq8074-add-MDIO-bus.patch
@@ -13,11 +13,9 @@ Link: https://lore.kernel.org/r/20211007115846.26255-1-robimarko@gmail.com
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 4512fcac0f9a..6ee54f89f973 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -230,6 +230,18 @@ pcie_phy1: phy@8e200 {
+@@ -230,6 +230,18 @@
  			};
  		};
  
@@ -36,6 +34,3 @@ index 4512fcac0f9a..6ee54f89f973 100644
  		prng: rng@e3000 {
  			compatible = "qcom,prng-ee";
  			reg = <0x000e3000 0x1000>;
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0009-v5.18-arm64-dts-qcom-ipq8074-add-SMEM-support.patch b/target/linux/ipq60xx/patches-5.15/0009-v5.18-arm64-dts-qcom-ipq8074-add-SMEM-support.patch
index 3da3aa046..1a2bdd07c 100644
--- a/target/linux/ipq60xx/patches-5.15/0009-v5.18-arm64-dts-qcom-ipq8074-add-SMEM-support.patch
+++ b/target/linux/ipq60xx/patches-5.15/0009-v5.18-arm64-dts-qcom-ipq8074-add-SMEM-support.patch
@@ -13,11 +13,9 @@ Link: https://lore.kernel.org/r/20220106212512.1970828-1-robimarko@gmail.com
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 20 ++++++++++++++++++++
  1 file changed, 20 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 6ee54f89f973..954f85c460ed 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -76,6 +76,20 @@ psci {
+@@ -76,6 +76,20 @@
  		method = "smc";
  	};
  
@@ -38,7 +36,7 @@ index 6ee54f89f973..954f85c460ed 100644
  	firmware {
  		scm {
  			compatible = "qcom,scm-ipq8074", "qcom,scm";
-@@ -331,6 +345,12 @@ gcc: gcc@1800000 {
+@@ -331,6 +345,12 @@
  			#reset-cells = <0x1>;
  		};
  
@@ -51,6 +49,3 @@ index 6ee54f89f973..954f85c460ed 100644
  		spmi_bus: spmi@200f000 {
  			compatible = "qcom,spmi-pmic-arb";
  			reg = <0x0200f000 0x001000>,
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0010-v5.18-arm64-dts-qcom-ipq8074-add-the-reserved-memory-node.patch b/target/linux/ipq60xx/patches-5.15/0010-v5.18-arm64-dts-qcom-ipq8074-add-the-reserved-memory-node.patch
index b4f3ae725..6b617f955 100644
--- a/target/linux/ipq60xx/patches-5.15/0010-v5.18-arm64-dts-qcom-ipq8074-add-the-reserved-memory-node.patch
+++ b/target/linux/ipq60xx/patches-5.15/0010-v5.18-arm64-dts-qcom-ipq8074-add-the-reserved-memory-node.patch
@@ -14,11 +14,9 @@ Link: https://lore.kernel.org/r/1641560078-860-1-git-send-email-quic_kathirav@qu
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 5 +++++
  1 file changed, 5 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 954f85c460ed..9e8e907290a4 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -88,6 +88,11 @@ smem@4ab00000 {
+@@ -88,6 +88,11 @@
  
  			hwlocks = <&tcsr_mutex 0>;
  		};
@@ -30,6 +28,3 @@ index 954f85c460ed..9e8e907290a4 100644
  	};
  
  	firmware {
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0011-v5.18-arm64-dts-qcom-ipq8074-enable-the-GICv2m-support.patch b/target/linux/ipq60xx/patches-5.15/0011-v5.18-arm64-dts-qcom-ipq8074-enable-the-GICv2m-support.patch
index 100738bbd..274940d40 100644
--- a/target/linux/ipq60xx/patches-5.15/0011-v5.18-arm64-dts-qcom-ipq8074-enable-the-GICv2m-support.patch
+++ b/target/linux/ipq60xx/patches-5.15/0011-v5.18-arm64-dts-qcom-ipq8074-enable-the-GICv2m-support.patch
@@ -13,11 +13,9 @@ Link: https://lore.kernel.org/r/1644334525-11577-2-git-send-email-quic_kathirav@
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 9 +++++++++
  1 file changed, 9 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 9e8e907290a4..c98443d4798f 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -634,9 +634,18 @@ dwc_1: dwc3@8c00000 {
+@@ -634,9 +634,18 @@
  
  		intc: interrupt-controller@b000000 {
  			compatible = "qcom,msm-qgic2";
@@ -36,6 +34,3 @@ index 9e8e907290a4..c98443d4798f 100644
  		};
  
  		timer {
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0012-v5.18-arm64-dts-qcom-ipq8074-drop-the-clock-frequency-prop.patch b/target/linux/ipq60xx/patches-5.15/0012-v5.18-arm64-dts-qcom-ipq8074-drop-the-clock-frequency-prop.patch
index e4d31333a..9c24d6431 100644
--- a/target/linux/ipq60xx/patches-5.15/0012-v5.18-arm64-dts-qcom-ipq8074-drop-the-clock-frequency-prop.patch
+++ b/target/linux/ipq60xx/patches-5.15/0012-v5.18-arm64-dts-qcom-ipq8074-drop-the-clock-frequency-prop.patch
@@ -14,11 +14,9 @@ Link: https://lore.kernel.org/r/1643819709-5410-2-git-send-email-quic_kathirav@q
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index c98443d4798f..664fba3632b1 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -670,7 +670,6 @@ timer@b120000 {
+@@ -670,7 +670,6 @@
  			ranges;
  			compatible = "arm,armv7-timer-mem";
  			reg = <0x0b120000 0x1000>;
@@ -26,6 +24,3 @@ index c98443d4798f..664fba3632b1 100644
  
  			frame@b120000 {
  				frame-number = <0>;
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0013-v5.19-arm64-dts-qcom-align-dmas-in-I2C-SPI-UART-with-DT-sc.patch b/target/linux/ipq60xx/patches-5.15/0013-v5.19-arm64-dts-qcom-align-dmas-in-I2C-SPI-UART-with-DT-sc.patch
index 08160dc42..1a6864d94 100644
--- a/target/linux/ipq60xx/patches-5.15/0013-v5.19-arm64-dts-qcom-align-dmas-in-I2C-SPI-UART-with-DT-sc.patch
+++ b/target/linux/ipq60xx/patches-5.15/0013-v5.19-arm64-dts-qcom-align-dmas-in-I2C-SPI-UART-with-DT-sc.patch
@@ -14,11 +14,9 @@ Link: https://lore.kernel.org/r/20220405063451.12011-2-krzysztof.kozlowski@linar
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 664fba3632b1..61fc121dce7b 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -471,8 +471,8 @@ blsp1_i2c2: i2c@78b6000 {
+@@ -471,8 +471,8 @@
  				<&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>;
  			clock-names = "iface", "core";
  			clock-frequency = <400000>;
@@ -29,7 +27,7 @@ index 664fba3632b1..61fc121dce7b 100644
  			pinctrl-0 = <&i2c_0_pins>;
  			pinctrl-names = "default";
  			status = "disabled";
-@@ -488,8 +488,8 @@ blsp1_i2c3: i2c@78b7000 {
+@@ -488,8 +488,8 @@
  				<&gcc GCC_BLSP1_QUP3_I2C_APPS_CLK>;
  			clock-names = "iface", "core";
  			clock-frequency = <100000>;
@@ -40,7 +38,7 @@ index 664fba3632b1..61fc121dce7b 100644
  			status = "disabled";
  		};
  
-@@ -503,8 +503,8 @@ blsp1_i2c5: i2c@78b9000 {
+@@ -503,8 +503,8 @@
  				 <&gcc GCC_BLSP1_QUP5_I2C_APPS_CLK>;
  			clock-names = "iface", "core";
  			clock-frequency = <400000>;
@@ -51,7 +49,7 @@ index 664fba3632b1..61fc121dce7b 100644
  			status = "disabled";
  		};
  
-@@ -518,8 +518,8 @@ blsp1_i2c6: i2c@78ba000 {
+@@ -518,8 +518,8 @@
  				 <&gcc GCC_BLSP1_QUP6_I2C_APPS_CLK>;
  			clock-names = "iface", "core";
  			clock-frequency = <100000>;
@@ -62,6 +60,3 @@ index 664fba3632b1..61fc121dce7b 100644
  			status = "disabled";
  		};
  
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0014-v5.19-arm64-dts-qcom-align-clocks-in-I2C-SPI-with-DT-schem.patch b/target/linux/ipq60xx/patches-5.15/0014-v5.19-arm64-dts-qcom-align-clocks-in-I2C-SPI-with-DT-schem.patch
index ad9e1e4ac..616ccf171 100644
--- a/target/linux/ipq60xx/patches-5.15/0014-v5.19-arm64-dts-qcom-align-clocks-in-I2C-SPI-with-DT-schem.patch
+++ b/target/linux/ipq60xx/patches-5.15/0014-v5.19-arm64-dts-qcom-align-clocks-in-I2C-SPI-with-DT-schem.patch
@@ -13,11 +13,9 @@ Link: https://lore.kernel.org/r/20220405063451.12011-3-krzysztof.kozlowski@linar
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 24 ++++++++++++------------
  1 file changed, 12 insertions(+), 12 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 61fc121dce7b..e771ceea7453 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -467,9 +467,9 @@ blsp1_i2c2: i2c@78b6000 {
+@@ -467,9 +467,9 @@
  			#size-cells = <0>;
  			reg = <0x078b6000 0x600>;
  			interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
@@ -30,7 +28,7 @@ index 61fc121dce7b..e771ceea7453 100644
  			clock-frequency = <400000>;
  			dmas = <&blsp_dma 14>, <&blsp_dma 15>;
  			dma-names = "tx", "rx";
-@@ -484,9 +484,9 @@ blsp1_i2c3: i2c@78b7000 {
+@@ -484,9 +484,9 @@
  			#size-cells = <0>;
  			reg = <0x078b7000 0x600>;
  			interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
@@ -43,7 +41,7 @@ index 61fc121dce7b..e771ceea7453 100644
  			clock-frequency = <100000>;
  			dmas = <&blsp_dma 16>, <&blsp_dma 17>;
  			dma-names = "tx", "rx";
-@@ -499,9 +499,9 @@ blsp1_i2c5: i2c@78b9000 {
+@@ -499,9 +499,9 @@
  			#size-cells = <0>;
  			reg = <0x78b9000 0x600>;
  			interrupts = <GIC_SPI 299 IRQ_TYPE_LEVEL_HIGH>;
@@ -56,7 +54,7 @@ index 61fc121dce7b..e771ceea7453 100644
  			clock-frequency = <400000>;
  			dmas = <&blsp_dma 20>, <&blsp_dma 21>;
  			dma-names = "tx", "rx";
-@@ -514,9 +514,9 @@ blsp1_i2c6: i2c@78ba000 {
+@@ -514,9 +514,9 @@
  			#size-cells = <0>;
  			reg = <0x078ba000 0x600>;
  			interrupts = <GIC_SPI 300 IRQ_TYPE_LEVEL_HIGH>;
@@ -69,6 +67,3 @@ index 61fc121dce7b..e771ceea7453 100644
  			clock-frequency = <100000>;
  			dmas = <&blsp_dma 22>, <&blsp_dma 23>;
  			dma-names = "tx", "rx";
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0015-v5.19-arm64-dts-qcom-correct-DWC3-node-names-and-unit-addr.patch b/target/linux/ipq60xx/patches-5.15/0015-v5.19-arm64-dts-qcom-correct-DWC3-node-names-and-unit-addr.patch
index b08202256..f5077d9e0 100644
--- a/target/linux/ipq60xx/patches-5.15/0015-v5.19-arm64-dts-qcom-correct-DWC3-node-names-and-unit-addr.patch
+++ b/target/linux/ipq60xx/patches-5.15/0015-v5.19-arm64-dts-qcom-correct-DWC3-node-names-and-unit-addr.patch
@@ -15,11 +15,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index e771ceea7453..51c3eb1bd393 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -578,7 +578,7 @@ usb_0: usb@8af8800 {
+@@ -578,7 +578,7 @@
  			resets = <&gcc GCC_USB0_BCR>;
  			status = "disabled";
  
@@ -28,7 +26,7 @@ index e771ceea7453..51c3eb1bd393 100644
  				compatible = "snps,dwc3";
  				reg = <0x8a00000 0xcd00>;
  				interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
-@@ -618,7 +618,7 @@ usb_1: usb@8cf8800 {
+@@ -618,7 +618,7 @@
  			resets = <&gcc GCC_USB1_BCR>;
  			status = "disabled";
  
@@ -37,6 +35,3 @@ index e771ceea7453..51c3eb1bd393 100644
  				compatible = "snps,dwc3";
  				reg = <0x8c00000 0xcd00>;
  				interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0016-v5.19-arm64-dts-qcom-ipq8074-add-dedicated-qcom-ipq8074-dw.patch b/target/linux/ipq60xx/patches-5.15/0016-v5.19-arm64-dts-qcom-ipq8074-add-dedicated-qcom-ipq8074-dw.patch
index 08050ee65..fd035e1a6 100644
--- a/target/linux/ipq60xx/patches-5.15/0016-v5.19-arm64-dts-qcom-ipq8074-add-dedicated-qcom-ipq8074-dw.patch
+++ b/target/linux/ipq60xx/patches-5.15/0016-v5.19-arm64-dts-qcom-ipq8074-add-dedicated-qcom-ipq8074-dw.patch
@@ -14,11 +14,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 51c3eb1bd393..4d3ecb09de9c 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -553,7 +553,7 @@ qpic_nand: nand-controller@79b0000 {
+@@ -553,7 +553,7 @@
  		};
  
  		usb_0: usb@8af8800 {
@@ -27,7 +25,7 @@ index 51c3eb1bd393..4d3ecb09de9c 100644
  			reg = <0x08af8800 0x400>;
  			#address-cells = <1>;
  			#size-cells = <1>;
-@@ -593,7 +593,7 @@ dwc_0: usb@8a00000 {
+@@ -593,7 +593,7 @@
  		};
  
  		usb_1: usb@8cf8800 {
@@ -36,6 +34,3 @@ index 51c3eb1bd393..4d3ecb09de9c 100644
  			reg = <0x08cf8800 0x400>;
  			#address-cells = <1>;
  			#size-cells = <1>;
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0017-v5.19-arm64-dts-qcom-align-DWC3-USB-clocks-with-DT-schema.patch b/target/linux/ipq60xx/patches-5.15/0017-v5.19-arm64-dts-qcom-align-DWC3-USB-clocks-with-DT-schema.patch
index 3c494cd74..ca68245d5 100644
--- a/target/linux/ipq60xx/patches-5.15/0017-v5.19-arm64-dts-qcom-align-DWC3-USB-clocks-with-DT-schema.patch
+++ b/target/linux/ipq60xx/patches-5.15/0017-v5.19-arm64-dts-qcom-align-DWC3-USB-clocks-with-DT-schema.patch
@@ -13,11 +13,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 4d3ecb09de9c..697f46e17903 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -563,8 +563,8 @@ usb_0: usb@8af8800 {
+@@ -563,8 +563,8 @@
  				<&gcc GCC_USB0_MASTER_CLK>,
  				<&gcc GCC_USB0_SLEEP_CLK>,
  				<&gcc GCC_USB0_MOCK_UTMI_CLK>;
@@ -28,7 +26,7 @@ index 4d3ecb09de9c..697f46e17903 100644
  				"sleep",
  				"mock_utmi";
  
-@@ -603,8 +603,8 @@ usb_1: usb@8cf8800 {
+@@ -603,8 +603,8 @@
  				<&gcc GCC_USB1_MASTER_CLK>,
  				<&gcc GCC_USB1_SLEEP_CLK>,
  				<&gcc GCC_USB1_MOCK_UTMI_CLK>;
@@ -39,6 +37,3 @@ index 4d3ecb09de9c..697f46e17903 100644
  				"sleep",
  				"mock_utmi";
  
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0018-v6.0-arm64-dts-qcom-adjust-whitespace-around.patch b/target/linux/ipq60xx/patches-5.15/0018-v6.0-arm64-dts-qcom-adjust-whitespace-around.patch
index 2e1f69770..c1ef33807 100644
--- a/target/linux/ipq60xx/patches-5.15/0018-v6.0-arm64-dts-qcom-adjust-whitespace-around.patch
+++ b/target/linux/ipq60xx/patches-5.15/0018-v6.0-arm64-dts-qcom-adjust-whitespace-around.patch
@@ -14,11 +14,9 @@ Link: https://lore.kernel.org/r/20220526204248.832139-1-krzysztof.kozlowski@lina
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 697f46e17903..6a4bcf3ef94e 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -119,7 +119,7 @@ ssphy_1: phy@58000 {
+@@ -119,7 +119,7 @@
  				<&xo>;
  			clock-names = "aux", "cfg_ahb", "ref";
  
@@ -27,7 +25,7 @@ index 697f46e17903..6a4bcf3ef94e 100644
  				<&gcc GCC_USB3PHY_1_PHY_BCR>;
  			reset-names = "phy","common";
  			status = "disabled";
-@@ -162,7 +162,7 @@ ssphy_0: phy@78000 {
+@@ -162,7 +162,7 @@
  				<&xo>;
  			clock-names = "aux", "cfg_ahb", "ref";
  
@@ -36,6 +34,3 @@ index 697f46e17903..6a4bcf3ef94e 100644
  				<&gcc GCC_USB3PHY_0_PHY_BCR>;
  			reset-names = "phy","common";
  			status = "disabled";
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0019-v6.0-arm64-dts-qcom-Fix-sdhci-node-names-use-mmc.patch b/target/linux/ipq60xx/patches-5.15/0019-v6.0-arm64-dts-qcom-Fix-sdhci-node-names-use-mmc.patch
index f1a55ea5d..6afe50725 100644
--- a/target/linux/ipq60xx/patches-5.15/0019-v6.0-arm64-dts-qcom-Fix-sdhci-node-names-use-mmc.patch
+++ b/target/linux/ipq60xx/patches-5.15/0019-v6.0-arm64-dts-qcom-Fix-sdhci-node-names-use-mmc.patch
@@ -21,11 +21,9 @@ Link: https://lore.kernel.org/r/20220514215424.1007718-2-bhupesh.sharma@linaro.o
  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 6a4bcf3ef94e..3658f41393e1 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -375,7 +375,7 @@ spmi_bus: spmi@200f000 {
+@@ -375,7 +375,7 @@
  			cell-index = <0>;
  		};
  
@@ -34,6 +32,3 @@ index 6a4bcf3ef94e..3658f41393e1 100644
  			compatible = "qcom,sdhci-msm-v4";
  			reg = <0x7824900 0x500>, <0x7824000 0x800>;
  			reg-names = "hc_mem", "core_mem";
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0020-v6.0-arm64-dts-qcom-Fix-ordering-of-clocks-clock-names-fo.patch b/target/linux/ipq60xx/patches-5.15/0020-v6.0-arm64-dts-qcom-Fix-ordering-of-clocks-clock-names-fo.patch
index 5758242b6..f26d01bc3 100644
--- a/target/linux/ipq60xx/patches-5.15/0020-v6.0-arm64-dts-qcom-Fix-ordering-of-clocks-clock-names-fo.patch
+++ b/target/linux/ipq60xx/patches-5.15/0020-v6.0-arm64-dts-qcom-Fix-ordering-of-clocks-clock-names-fo.patch
@@ -28,11 +28,9 @@ Link: https://lore.kernel.org/r/20220514215424.1007718-5-bhupesh.sharma@linaro.o
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 3658f41393e1..cdeb6e3f9a92 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -384,10 +384,10 @@ sdhc_1: mmc@7824900 {
+@@ -384,10 +384,10 @@
  				     <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;
  			interrupt-names = "hc_irq", "pwr_irq";
  
@@ -47,6 +45,3 @@ index 3658f41393e1..cdeb6e3f9a92 100644
  			max-frequency = <384000000>;
  			mmc-ddr-1_8v;
  			mmc-hs200-1_8v;
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0021-v6.0-dt-bindings-clock-qcom-ipq8074-add-PPE-crypto-clock.patch b/target/linux/ipq60xx/patches-5.15/0021-v6.0-dt-bindings-clock-qcom-ipq8074-add-PPE-crypto-clock.patch
index 3517a9655..3985f363a 100644
--- a/target/linux/ipq60xx/patches-5.15/0021-v6.0-dt-bindings-clock-qcom-ipq8074-add-PPE-crypto-clock.patch
+++ b/target/linux/ipq60xx/patches-5.15/0021-v6.0-dt-bindings-clock-qcom-ipq8074-add-PPE-crypto-clock.patch
@@ -13,8 +13,6 @@ Link: https://lore.kernel.org/r/20220515210048.483898-4-robimarko@gmail.com
  include/dt-bindings/clock/qcom,gcc-ipq8074.h | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/include/dt-bindings/clock/qcom,gcc-ipq8074.h b/include/dt-bindings/clock/qcom,gcc-ipq8074.h
-index 8e2bec1c91bf..5f0928785d7a 100644
 --- a/include/dt-bindings/clock/qcom,gcc-ipq8074.h
 +++ b/include/dt-bindings/clock/qcom,gcc-ipq8074.h
 @@ -233,6 +233,7 @@
@@ -25,6 +23,3 @@ index 8e2bec1c91bf..5f0928785d7a 100644
  
  #define GCC_BLSP1_BCR				0
  #define GCC_BLSP1_QUP1_BCR			1
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0022-v6.0-clk-qcom-ipq8074-add-PPE-crypto-clock.patch b/target/linux/ipq60xx/patches-5.15/0022-v6.0-clk-qcom-ipq8074-add-PPE-crypto-clock.patch
index a3e8c1ca9..9cdcf1710 100644
--- a/target/linux/ipq60xx/patches-5.15/0022-v6.0-clk-qcom-ipq8074-add-PPE-crypto-clock.patch
+++ b/target/linux/ipq60xx/patches-5.15/0022-v6.0-clk-qcom-ipq8074-add-PPE-crypto-clock.patch
@@ -15,11 +15,9 @@ Link: https://lore.kernel.org/r/20220515210048.483898-5-robimarko@gmail.com
  drivers/clk/qcom/gcc-ipq8074.c | 19 +++++++++++++++++++
  1 file changed, 19 insertions(+)
 
-diff --git a/drivers/clk/qcom/gcc-ipq8074.c b/drivers/clk/qcom/gcc-ipq8074.c
-index d6d5defb82c9..bbd8c8f0ed6f 100644
 --- a/drivers/clk/qcom/gcc-ipq8074.c
 +++ b/drivers/clk/qcom/gcc-ipq8074.c
-@@ -3183,6 +3183,24 @@ static struct clk_branch gcc_nss_ptp_ref_clk = {
+@@ -3183,6 +3183,24 @@ static struct clk_branch gcc_nss_ptp_ref
  	},
  };
  
@@ -44,7 +42,7 @@ index d6d5defb82c9..bbd8c8f0ed6f 100644
  static struct clk_branch gcc_nssnoc_ce_apb_clk = {
  	.halt_reg = 0x6830c,
  	.clkr = {
-@@ -4655,6 +4673,7 @@ static struct clk_regmap *gcc_ipq8074_clks[] = {
+@@ -4655,6 +4673,7 @@ static struct clk_regmap *gcc_ipq8074_cl
  	[GCC_PCIE0_RCHNG_CLK_SRC] = &pcie0_rchng_clk_src.clkr,
  	[GCC_PCIE0_RCHNG_CLK] = &gcc_pcie0_rchng_clk.clkr,
  	[GCC_PCIE0_AXI_S_BRIDGE_CLK] = &gcc_pcie0_axi_s_bridge_clk.clkr,
@@ -52,6 +50,3 @@ index d6d5defb82c9..bbd8c8f0ed6f 100644
  };
  
  static const struct qcom_reset_map gcc_ipq8074_resets[] = {
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0023-v6.0-dt-bindings-clock-qcom-ipq8074-add-USB-GDSCs.patch b/target/linux/ipq60xx/patches-5.15/0023-v6.0-dt-bindings-clock-qcom-ipq8074-add-USB-GDSCs.patch
index 5124726a2..f3253edae 100644
--- a/target/linux/ipq60xx/patches-5.15/0023-v6.0-dt-bindings-clock-qcom-ipq8074-add-USB-GDSCs.patch
+++ b/target/linux/ipq60xx/patches-5.15/0023-v6.0-dt-bindings-clock-qcom-ipq8074-add-USB-GDSCs.patch
@@ -13,8 +13,6 @@ Link: https://lore.kernel.org/r/20220515210048.483898-8-robimarko@gmail.com
  include/dt-bindings/clock/qcom,gcc-ipq8074.h | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/include/dt-bindings/clock/qcom,gcc-ipq8074.h b/include/dt-bindings/clock/qcom,gcc-ipq8074.h
-index 5f0928785d7a..e4991d303708 100644
 --- a/include/dt-bindings/clock/qcom,gcc-ipq8074.h
 +++ b/include/dt-bindings/clock/qcom,gcc-ipq8074.h
 @@ -368,4 +368,7 @@
@@ -25,6 +23,3 @@ index 5f0928785d7a..e4991d303708 100644
 +#define USB1_GDSC				1
 +
  #endif
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0024-v6.0-clk-qcom-ipq8074-add-USB-GDSCs.patch b/target/linux/ipq60xx/patches-5.15/0024-v6.0-clk-qcom-ipq8074-add-USB-GDSCs.patch
index 4ea5e06e3..7eca353d2 100644
--- a/target/linux/ipq60xx/patches-5.15/0024-v6.0-clk-qcom-ipq8074-add-USB-GDSCs.patch
+++ b/target/linux/ipq60xx/patches-5.15/0024-v6.0-clk-qcom-ipq8074-add-USB-GDSCs.patch
@@ -13,8 +13,6 @@ Link: https://lore.kernel.org/r/20220515210048.483898-9-robimarko@gmail.com
  drivers/clk/qcom/gcc-ipq8074.c | 24 ++++++++++++++++++++++++
  2 files changed, 25 insertions(+)
 
-diff --git a/drivers/clk/qcom/Kconfig b/drivers/clk/qcom/Kconfig
-index 9ef007b3cf9b..3c84e34353a4 100644
 --- a/drivers/clk/qcom/Kconfig
 +++ b/drivers/clk/qcom/Kconfig
 @@ -166,6 +166,7 @@ config IPQ_LCC_806X
@@ -25,8 +23,6 @@ index 9ef007b3cf9b..3c84e34353a4 100644
  	help
  	  Support for global clock controller on ipq8074 devices.
  	  Say Y if you want to use peripheral devices such as UART, SPI,
-diff --git a/drivers/clk/qcom/gcc-ipq8074.c b/drivers/clk/qcom/gcc-ipq8074.c
-index bbd8c8f0ed6f..42d185fe19c8 100644
 --- a/drivers/clk/qcom/gcc-ipq8074.c
 +++ b/drivers/clk/qcom/gcc-ipq8074.c
 @@ -22,6 +22,7 @@
@@ -37,7 +33,7 @@ index bbd8c8f0ed6f..42d185fe19c8 100644
  #include "reset.h"
  
  enum {
-@@ -4408,6 +4409,22 @@ static struct clk_branch gcc_pcie0_axi_s_bridge_clk = {
+@@ -4408,6 +4409,22 @@ static struct clk_branch gcc_pcie0_axi_s
  	},
  };
  
@@ -60,7 +56,7 @@ index bbd8c8f0ed6f..42d185fe19c8 100644
  static const struct alpha_pll_config ubi32_pll_config = {
  	.l = 0x4e,
  	.config_ctl_val = 0x200d4aa8,
-@@ -4811,6 +4828,11 @@ static const struct qcom_reset_map gcc_ipq8074_resets[] = {
+@@ -4811,6 +4828,11 @@ static const struct qcom_reset_map gcc_i
  	[GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 },
  };
  
@@ -72,7 +68,7 @@ index bbd8c8f0ed6f..42d185fe19c8 100644
  static const struct of_device_id gcc_ipq8074_match_table[] = {
  	{ .compatible = "qcom,gcc-ipq8074" },
  	{ }
-@@ -4833,6 +4855,8 @@ static const struct qcom_cc_desc gcc_ipq8074_desc = {
+@@ -4833,6 +4855,8 @@ static const struct qcom_cc_desc gcc_ipq
  	.num_resets = ARRAY_SIZE(gcc_ipq8074_resets),
  	.clk_hws = gcc_ipq8074_hws,
  	.num_clk_hws = ARRAY_SIZE(gcc_ipq8074_hws),
@@ -81,6 +77,3 @@ index bbd8c8f0ed6f..42d185fe19c8 100644
  };
  
  static int gcc_ipq8074_probe(struct platform_device *pdev)
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0025-v6.0-arm64-dts-qcom-ipq8074-add-USB-power-domains.patch b/target/linux/ipq60xx/patches-5.15/0025-v6.0-arm64-dts-qcom-ipq8074-add-USB-power-domains.patch
index 13fad5456..9e356189b 100644
--- a/target/linux/ipq60xx/patches-5.15/0025-v6.0-arm64-dts-qcom-ipq8074-add-USB-power-domains.patch
+++ b/target/linux/ipq60xx/patches-5.15/0025-v6.0-arm64-dts-qcom-ipq8074-add-USB-power-domains.patch
@@ -13,11 +13,9 @@ Link: https://lore.kernel.org/r/20220515210048.483898-11-robimarko@gmail.com
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 5 +++++
  1 file changed, 5 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index cdeb6e3f9a92..a6cb0dafcc17 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -347,6 +347,7 @@ gcc: gcc@1800000 {
+@@ -347,6 +347,7 @@
  			compatible = "qcom,gcc-ipq8074";
  			reg = <0x01800000 0x80000>;
  			#clock-cells = <0x1>;
@@ -25,7 +23,7 @@ index cdeb6e3f9a92..a6cb0dafcc17 100644
  			#reset-cells = <0x1>;
  		};
  
-@@ -575,6 +576,8 @@ usb_0: usb@8af8800 {
+@@ -575,6 +576,8 @@
  						<133330000>,
  						<19200000>;
  
@@ -34,7 +32,7 @@ index cdeb6e3f9a92..a6cb0dafcc17 100644
  			resets = <&gcc GCC_USB0_BCR>;
  			status = "disabled";
  
-@@ -615,6 +618,8 @@ usb_1: usb@8cf8800 {
+@@ -615,6 +618,8 @@
  						<133330000>,
  						<19200000>;
  
@@ -43,6 +41,3 @@ index cdeb6e3f9a92..a6cb0dafcc17 100644
  			resets = <&gcc GCC_USB1_BCR>;
  			status = "disabled";
  
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0026-v6.0-arm64-dts-qcom-ipq8074-move-ARMv8-timer-out-of-SoC-n.patch b/target/linux/ipq60xx/patches-5.15/0026-v6.0-arm64-dts-qcom-ipq8074-move-ARMv8-timer-out-of-SoC-n.patch
index f291cd711..539db4d71 100644
--- a/target/linux/ipq60xx/patches-5.15/0026-v6.0-arm64-dts-qcom-ipq8074-move-ARMv8-timer-out-of-SoC-n.patch
+++ b/target/linux/ipq60xx/patches-5.15/0026-v6.0-arm64-dts-qcom-ipq8074-move-ARMv8-timer-out-of-SoC-n.patch
@@ -19,11 +19,9 @@ Link: https://lore.kernel.org/r/20220704113318.623102-1-robimarko@gmail.com
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index a6cb0dafcc17..3779563527fa 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -653,14 +653,6 @@ v2m@0 {
+@@ -653,14 +653,6 @@
  			};
  		};
  
@@ -38,7 +36,7 @@ index a6cb0dafcc17..3779563527fa 100644
  		watchdog: watchdog@b017000 {
  			compatible = "qcom,kpss-wdt";
  			reg = <0xb017000 0x1000>;
-@@ -852,4 +844,12 @@ IRQ_TYPE_LEVEL_HIGH>, /* int_c */
+@@ -852,4 +844,12 @@
  			status = "disabled";
  		};
  	};
@@ -51,6 +49,3 @@ index a6cb0dafcc17..3779563527fa 100644
 +			     <GIC_PPI 1 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
 +	};
  };
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0027-v6.0-arm64-dts-qcom-ipq8074-add-reset-to-SDHCI.patch b/target/linux/ipq60xx/patches-5.15/0027-v6.0-arm64-dts-qcom-ipq8074-add-reset-to-SDHCI.patch
index d75d9d77e..faaf1b663 100644
--- a/target/linux/ipq60xx/patches-5.15/0027-v6.0-arm64-dts-qcom-ipq8074-add-reset-to-SDHCI.patch
+++ b/target/linux/ipq60xx/patches-5.15/0027-v6.0-arm64-dts-qcom-ipq8074-add-reset-to-SDHCI.patch
@@ -15,11 +15,9 @@ Link: https://lore.kernel.org/r/20220704143554.1180927-2-robimarko@gmail.com
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 3779563527fa..c4f9bec9a39b 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -389,6 +389,7 @@ sdhc_1: mmc@7824900 {
+@@ -389,6 +389,7 @@
  				 <&gcc GCC_SDCC1_APPS_CLK>,
  				 <&xo>;
  			clock-names = "iface", "core", "xo";
@@ -27,6 +25,3 @@ index 3779563527fa..c4f9bec9a39b 100644
  			max-frequency = <384000000>;
  			mmc-ddr-1_8v;
  			mmc-hs200-1_8v;
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0028-v6.0-arm64-dts-qcom-ipq8074-drop-USB-PHY-clock-index.patch b/target/linux/ipq60xx/patches-5.15/0028-v6.0-arm64-dts-qcom-ipq8074-drop-USB-PHY-clock-index.patch
index a03a0f749..4f5148d16 100644
--- a/target/linux/ipq60xx/patches-5.15/0028-v6.0-arm64-dts-qcom-ipq8074-drop-USB-PHY-clock-index.patch
+++ b/target/linux/ipq60xx/patches-5.15/0028-v6.0-arm64-dts-qcom-ipq8074-drop-USB-PHY-clock-index.patch
@@ -14,11 +14,9 @@ Link: https://lore.kernel.org/r/20220705114032.22787-5-johan+linaro@kernel.org
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index c4f9bec9a39b..edcb6a500175 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -130,7 +130,7 @@ usb1_ssphy: phy@58200 {
+@@ -130,7 +130,7 @@
  				      <0x00058800 0x1f8>,     /* PCS  */
  				      <0x00058600 0x044>;     /* PCS misc*/
  				#phy-cells = <0>;
@@ -27,7 +25,7 @@ index c4f9bec9a39b..edcb6a500175 100644
  				clocks = <&gcc GCC_USB1_PIPE_CLK>;
  				clock-names = "pipe0";
  				clock-output-names = "gcc_usb1_pipe_clk_src";
-@@ -173,7 +173,7 @@ usb0_ssphy: phy@78200 {
+@@ -173,7 +173,7 @@
  				      <0x00078800 0x1f8>,     /* PCS  */
  				      <0x00078600 0x044>;     /* PCS misc*/
  				#phy-cells = <0>;
@@ -36,6 +34,3 @@ index c4f9bec9a39b..edcb6a500175 100644
  				clocks = <&gcc GCC_USB0_PIPE_CLK>;
  				clock-names = "pipe0";
  				clock-output-names = "gcc_usb0_pipe_clk_src";
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0029-v6.0-arm64-dts-qcom-ipq8074-add-APCS-node.patch b/target/linux/ipq60xx/patches-5.15/0029-v6.0-arm64-dts-qcom-ipq8074-add-APCS-node.patch
index 843cb678b..edb9faf69 100644
--- a/target/linux/ipq60xx/patches-5.15/0029-v6.0-arm64-dts-qcom-ipq8074-add-APCS-node.patch
+++ b/target/linux/ipq60xx/patches-5.15/0029-v6.0-arm64-dts-qcom-ipq8074-add-APCS-node.patch
@@ -18,11 +18,9 @@ Link: https://lore.kernel.org/r/20220707173733.404947-4-robimarko@gmail.com
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 8 ++++++++
  1 file changed, 8 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index edcb6a500175..14487a39fb6c 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -662,6 +662,14 @@ watchdog: watchdog@b017000 {
+@@ -662,6 +662,14 @@
  			timeout-sec = <30>;
  		};
  
@@ -37,6 +35,3 @@ index edcb6a500175..14487a39fb6c 100644
  		timer@b120000 {
  			#address-cells = <1>;
  			#size-cells = <1>;
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0030-v6.0-arm64-dts-qcom-ipq8074-add-size-address-cells-to-DTS.patch b/target/linux/ipq60xx/patches-5.15/0030-v6.0-arm64-dts-qcom-ipq8074-add-size-address-cells-to-DTS.patch
index a2ab6324f..02db52eae 100644
--- a/target/linux/ipq60xx/patches-5.15/0030-v6.0-arm64-dts-qcom-ipq8074-add-size-address-cells-to-DTS.patch
+++ b/target/linux/ipq60xx/patches-5.15/0030-v6.0-arm64-dts-qcom-ipq8074-add-size-address-cells-to-DTS.patch
@@ -18,8 +18,6 @@ Link: https://lore.kernel.org/r/20220708133846.599735-1-robimarko@gmail.com
  arch/arm64/boot/dts/qcom/ipq8074.dtsi      | 3 +++
  3 files changed, 3 insertions(+), 5 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts b/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts
-index cc08dc4eb56a..3308e37f6abb 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts
 +++ b/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts
 @@ -5,8 +5,6 @@
@@ -31,8 +29,6 @@ index cc08dc4eb56a..3308e37f6abb 100644
  	model = "Qualcomm Technologies, Inc. IPQ8074-HK01";
  	compatible = "qcom,ipq8074-hk01", "qcom,ipq8074";
  	interrupt-parent = <&intc>;
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi b/arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi
-index 07e670829676..0043cc23cf7d 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi
 @@ -7,9 +7,6 @@
@@ -45,8 +41,6 @@ index 07e670829676..0043cc23cf7d 100644
  	interrupt-parent = <&intc>;
  
  	aliases {
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 14487a39fb6c..e516d13b8f98 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 @@ -7,6 +7,9 @@
@@ -59,6 +53,3 @@ index 14487a39fb6c..e516d13b8f98 100644
  	model = "Qualcomm Technologies, Inc. IPQ8074";
  	compatible = "qcom,ipq8074";
  
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0031-v6.0-arm64-dts-qcom-ipq8074-add-interrupt-parent-to-DTSI.patch b/target/linux/ipq60xx/patches-5.15/0031-v6.0-arm64-dts-qcom-ipq8074-add-interrupt-parent-to-DTSI.patch
index 7e0373998..bbe4bf1bd 100644
--- a/target/linux/ipq60xx/patches-5.15/0031-v6.0-arm64-dts-qcom-ipq8074-add-interrupt-parent-to-DTSI.patch
+++ b/target/linux/ipq60xx/patches-5.15/0031-v6.0-arm64-dts-qcom-ipq8074-add-interrupt-parent-to-DTSI.patch
@@ -17,8 +17,6 @@ Link: https://lore.kernel.org/r/20220708133846.599735-2-robimarko@gmail.com
  arch/arm64/boot/dts/qcom/ipq8074.dtsi      | 1 +
  3 files changed, 1 insertion(+), 3 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts b/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts
-index 3308e37f6abb..ef30053136e3 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts
 +++ b/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts
 @@ -7,7 +7,6 @@
@@ -29,8 +27,6 @@ index 3308e37f6abb..ef30053136e3 100644
  
  	aliases {
  		serial0 = &blsp1_uart5;
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi b/arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi
-index 0043cc23cf7d..c479a3fd0f40 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi
 @@ -7,8 +7,6 @@
@@ -42,11 +38,9 @@ index 0043cc23cf7d..c479a3fd0f40 100644
  	aliases {
  		serial0 = &blsp1_uart5;
  	};
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index e516d13b8f98..d53675fc1595 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -12,6 +12,7 @@ / {
+@@ -12,6 +12,7 @@
  
  	model = "Qualcomm Technologies, Inc. IPQ8074";
  	compatible = "qcom,ipq8074";
@@ -54,6 +48,3 @@ index e516d13b8f98..d53675fc1595 100644
  
  	clocks {
  		sleep_clk: sleep_clk {
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0032-v6.0-regulator-qcom_spmi-add-support-for-HT_P150.patch b/target/linux/ipq60xx/patches-5.15/0032-v6.0-regulator-qcom_spmi-add-support-for-HT_P150.patch
index 9f66f30e0..be0479714 100644
--- a/target/linux/ipq60xx/patches-5.15/0032-v6.0-regulator-qcom_spmi-add-support-for-HT_P150.patch
+++ b/target/linux/ipq60xx/patches-5.15/0032-v6.0-regulator-qcom_spmi-add-support-for-HT_P150.patch
@@ -19,8 +19,6 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
  drivers/regulator/qcom_spmi-regulator.c | 7 +++++++
  1 file changed, 7 insertions(+)
 
-diff --git a/drivers/regulator/qcom_spmi-regulator.c b/drivers/regulator/qcom_spmi-regulator.c
-index 41424a3366d0..49e5fe168391 100644
 --- a/drivers/regulator/qcom_spmi-regulator.c
 +++ b/drivers/regulator/qcom_spmi-regulator.c
 @@ -164,6 +164,7 @@ enum spmi_regulator_subtype {
@@ -31,7 +29,7 @@ index 41424a3366d0..49e5fe168391 100644
  };
  
  enum spmi_common_regulator_registers {
-@@ -544,6 +545,10 @@ static struct spmi_voltage_range hfs430_ranges[] = {
+@@ -544,6 +545,10 @@ static struct spmi_voltage_range hfs430_
  	SPMI_VOLTAGE_RANGE(0, 320000, 320000, 2040000, 2040000, 8000),
  };
  
@@ -50,7 +48,7 @@ index 41424a3366d0..49e5fe168391 100644
  
  static inline int spmi_vreg_read(struct spmi_regulator *vreg, u16 addr, u8 *buf,
  				 int len)
-@@ -1458,6 +1464,7 @@ static const struct regulator_ops spmi_hfs430_ops = {
+@@ -1458,6 +1464,7 @@ static const struct regulator_ops spmi_h
  
  static const struct spmi_regulator_mapping supported_regulators[] = {
  	/*           type subtype dig_min dig_max ltype ops setpoints hpm_min */
@@ -58,6 +56,3 @@ index 41424a3366d0..49e5fe168391 100644
  	SPMI_VREG(BUCK,  GP_CTL,   0, INF, SMPS,   smps,   smps,   100000),
  	SPMI_VREG(BUCK,  HFS430,   0, INF, HFS430, hfs430, hfs430,  10000),
  	SPMI_VREG(LDO,   N300,     0, INF, LDO,    ldo,    nldo1,   10000),
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0033-v6.0-regulator-qcom_spmi-add-support-for-HT_P600.patch b/target/linux/ipq60xx/patches-5.15/0033-v6.0-regulator-qcom_spmi-add-support-for-HT_P600.patch
index 9648207c8..a326481ea 100644
--- a/target/linux/ipq60xx/patches-5.15/0033-v6.0-regulator-qcom_spmi-add-support-for-HT_P600.patch
+++ b/target/linux/ipq60xx/patches-5.15/0033-v6.0-regulator-qcom_spmi-add-support-for-HT_P600.patch
@@ -20,8 +20,6 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
  drivers/regulator/qcom_spmi-regulator.c | 7 +++++++
  1 file changed, 7 insertions(+)
 
-diff --git a/drivers/regulator/qcom_spmi-regulator.c b/drivers/regulator/qcom_spmi-regulator.c
-index 49e5fe168391..828e97b873df 100644
 --- a/drivers/regulator/qcom_spmi-regulator.c
 +++ b/drivers/regulator/qcom_spmi-regulator.c
 @@ -165,6 +165,7 @@ enum spmi_regulator_subtype {
@@ -32,7 +30,7 @@ index 49e5fe168391..828e97b873df 100644
  };
  
  enum spmi_common_regulator_registers {
-@@ -549,6 +550,10 @@ static struct spmi_voltage_range ht_p150_ranges[] = {
+@@ -549,6 +550,10 @@ static struct spmi_voltage_range ht_p150
  	SPMI_VOLTAGE_RANGE(0, 1616000, 1616000, 3304000, 3304000, 8000),
  };
  
@@ -43,7 +41,7 @@ index 49e5fe168391..828e97b873df 100644
  static DEFINE_SPMI_SET_POINTS(pldo);
  static DEFINE_SPMI_SET_POINTS(nldo1);
  static DEFINE_SPMI_SET_POINTS(nldo2);
-@@ -570,6 +575,7 @@ static DEFINE_SPMI_SET_POINTS(ht_lvpldo);
+@@ -570,6 +575,7 @@ static DEFINE_SPMI_SET_POINTS(ht_lvpldo)
  static DEFINE_SPMI_SET_POINTS(ht_nldo);
  static DEFINE_SPMI_SET_POINTS(hfs430);
  static DEFINE_SPMI_SET_POINTS(ht_p150);
@@ -51,7 +49,7 @@ index 49e5fe168391..828e97b873df 100644
  
  static inline int spmi_vreg_read(struct spmi_regulator *vreg, u16 addr, u8 *buf,
  				 int len)
-@@ -1464,6 +1470,7 @@ static const struct regulator_ops spmi_hfs430_ops = {
+@@ -1464,6 +1470,7 @@ static const struct regulator_ops spmi_h
  
  static const struct spmi_regulator_mapping supported_regulators[] = {
  	/*           type subtype dig_min dig_max ltype ops setpoints hpm_min */
@@ -59,6 +57,3 @@ index 49e5fe168391..828e97b873df 100644
  	SPMI_VREG(LDO,   HT_P150,  0, INF, HFS430, hfs430, ht_p150, 10000),
  	SPMI_VREG(BUCK,  GP_CTL,   0, INF, SMPS,   smps,   smps,   100000),
  	SPMI_VREG(BUCK,  HFS430,   0, INF, HFS430, hfs430, hfs430,  10000),
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0034-v6.0-regulator-qcom_spmi-add-support-for-PMP8074-regulato.patch b/target/linux/ipq60xx/patches-5.15/0034-v6.0-regulator-qcom_spmi-add-support-for-PMP8074-regulato.patch
index a713dd9f9..49eac1065 100644
--- a/target/linux/ipq60xx/patches-5.15/0034-v6.0-regulator-qcom_spmi-add-support-for-PMP8074-regulato.patch
+++ b/target/linux/ipq60xx/patches-5.15/0034-v6.0-regulator-qcom_spmi-add-support-for-PMP8074-regulato.patch
@@ -28,11 +28,9 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
  drivers/regulator/qcom_spmi-regulator.c | 23 +++++++++++++++++++++++
  1 file changed, 23 insertions(+)
 
-diff --git a/drivers/regulator/qcom_spmi-regulator.c b/drivers/regulator/qcom_spmi-regulator.c
-index 828e97b873df..13521d47d589 100644
 --- a/drivers/regulator/qcom_spmi-regulator.c
 +++ b/drivers/regulator/qcom_spmi-regulator.c
-@@ -2101,6 +2101,28 @@ static const struct spmi_regulator_data pm8005_regulators[] = {
+@@ -2101,6 +2101,28 @@ static const struct spmi_regulator_data
  	{ }
  };
  
@@ -61,7 +59,7 @@ index 828e97b873df..13521d47d589 100644
  static const struct spmi_regulator_data pms405_regulators[] = {
  	{ "s3", 0x1a00, "vdd_s3"},
  	{ }
-@@ -2117,6 +2139,7 @@ static const struct of_device_id qcom_spmi_regulator_match[] = {
+@@ -2117,6 +2139,7 @@ static const struct of_device_id qcom_sp
  	{ .compatible = "qcom,pmi8994-regulators", .data = &pmi8994_regulators },
  	{ .compatible = "qcom,pm660-regulators", .data = &pm660_regulators },
  	{ .compatible = "qcom,pm660l-regulators", .data = &pm660l_regulators },
@@ -69,6 +67,3 @@ index 828e97b873df..13521d47d589 100644
  	{ .compatible = "qcom,pms405-regulators", .data = &pms405_regulators },
  	{ }
  };
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0035-v6.0-pinctrl-qcom-pmic-gpio-add-support-for-PMP8074.patch b/target/linux/ipq60xx/patches-5.15/0035-v6.0-pinctrl-qcom-pmic-gpio-add-support-for-PMP8074.patch
index aa63a15f9..565d0513c 100644
--- a/target/linux/ipq60xx/patches-5.15/0035-v6.0-pinctrl-qcom-pmic-gpio-add-support-for-PMP8074.patch
+++ b/target/linux/ipq60xx/patches-5.15/0035-v6.0-pinctrl-qcom-pmic-gpio-add-support-for-PMP8074.patch
@@ -12,11 +12,9 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
-index b2562e893139..fe1d3b260e27 100644
 --- a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
 +++ b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
-@@ -1167,6 +1167,8 @@ static const struct of_device_id pmic_gpio_of_match[] = {
+@@ -1167,6 +1167,8 @@ static const struct of_device_id pmic_gp
  	{ .compatible = "qcom,pmi8998-gpio", .data = (void *) 14 },
  	{ .compatible = "qcom,pmk8350-gpio", .data = (void *) 4 },
  	{ .compatible = "qcom,pmm8155au-gpio", .data = (void *) 10 },
@@ -25,6 +23,3 @@ index b2562e893139..fe1d3b260e27 100644
  	{ .compatible = "qcom,pmr735a-gpio", .data = (void *) 4 },
  	{ .compatible = "qcom,pmr735b-gpio", .data = (void *) 4 },
  	/* pms405 has 12 GPIOs with holes on 1, 9, and 10 */
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0036-v5.16-mfd-qcom-spmi-pmic-Sort-compatibles-in-the-driver.patch b/target/linux/ipq60xx/patches-5.15/0036-v5.16-mfd-qcom-spmi-pmic-Sort-compatibles-in-the-driver.patch
index b2913a9d0..bbfb22614 100644
--- a/target/linux/ipq60xx/patches-5.15/0036-v5.16-mfd-qcom-spmi-pmic-Sort-compatibles-in-the-driver.patch
+++ b/target/linux/ipq60xx/patches-5.15/0036-v5.16-mfd-qcom-spmi-pmic-Sort-compatibles-in-the-driver.patch
@@ -13,8 +13,6 @@ Link: https://lore.kernel.org/r/20211017161218.2378176-2-bjorn.andersson@linaro.
  drivers/mfd/qcom-spmi-pmic.c | 30 +++++++++++++++---------------
  1 file changed, 15 insertions(+), 15 deletions(-)
 
-diff --git a/drivers/mfd/qcom-spmi-pmic.c b/drivers/mfd/qcom-spmi-pmic.c
-index a35d5cf16faa..8be07102a468 100644
 --- a/drivers/mfd/qcom-spmi-pmic.c
 +++ b/drivers/mfd/qcom-spmi-pmic.c
 @@ -40,27 +40,27 @@
@@ -60,6 +58,3 @@ index a35d5cf16faa..8be07102a468 100644
  	{ }
  };
  
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0037-v5.16-mfd-qcom-spmi-pmic-Add-missing-PMICs-supported-by-so.patch b/target/linux/ipq60xx/patches-5.15/0037-v5.16-mfd-qcom-spmi-pmic-Add-missing-PMICs-supported-by-so.patch
index 19f6ec8ac..b7fa5d03a 100644
--- a/target/linux/ipq60xx/patches-5.15/0037-v5.16-mfd-qcom-spmi-pmic-Add-missing-PMICs-supported-by-so.patch
+++ b/target/linux/ipq60xx/patches-5.15/0037-v5.16-mfd-qcom-spmi-pmic-Add-missing-PMICs-supported-by-so.patch
@@ -14,8 +14,6 @@ Link: https://lore.kernel.org/r/20211017161218.2378176-4-bjorn.andersson@linaro.
  drivers/mfd/qcom-spmi-pmic.c | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
 
-diff --git a/drivers/mfd/qcom-spmi-pmic.c b/drivers/mfd/qcom-spmi-pmic.c
-index 8be07102a468..1cacc00aa6c9 100644
 --- a/drivers/mfd/qcom-spmi-pmic.c
 +++ b/drivers/mfd/qcom-spmi-pmic.c
 @@ -31,6 +31,8 @@
@@ -41,7 +39,7 @@ index 8be07102a468..1cacc00aa6c9 100644
  
  static const struct of_device_id pmic_spmi_id_table[] = {
  	{ .compatible = "qcom,pm660",     .data = (void *)PM660_SUBTYPE },
-@@ -45,9 +54,15 @@ static const struct of_device_id pmic_spmi_id_table[] = {
+@@ -45,9 +54,15 @@ static const struct of_device_id pmic_sp
  	{ .compatible = "qcom,pm8004",    .data = (void *)PM8004_SUBTYPE },
  	{ .compatible = "qcom,pm8005",    .data = (void *)PM8005_SUBTYPE },
  	{ .compatible = "qcom,pm8019",    .data = (void *)PM8019_SUBTYPE },
@@ -57,7 +55,7 @@ index 8be07102a468..1cacc00aa6c9 100644
  	{ .compatible = "qcom,pm8909",    .data = (void *)PM8909_SUBTYPE },
  	{ .compatible = "qcom,pm8916",    .data = (void *)PM8916_SUBTYPE },
  	{ .compatible = "qcom,pm8941",    .data = (void *)PM8941_SUBTYPE },
-@@ -60,6 +75,8 @@ static const struct of_device_id pmic_spmi_id_table[] = {
+@@ -60,6 +75,8 @@ static const struct of_device_id pmic_sp
  	{ .compatible = "qcom,pmi8962",   .data = (void *)PMI8962_SUBTYPE },
  	{ .compatible = "qcom,pmi8994",   .data = (void *)PMI8994_SUBTYPE },
  	{ .compatible = "qcom,pmi8998",   .data = (void *)PMI8998_SUBTYPE },
@@ -66,6 +64,3 @@ index 8be07102a468..1cacc00aa6c9 100644
  	{ .compatible = "qcom,spmi-pmic", .data = (void *)COMMON_SUBTYPE },
  	{ }
  };
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0038-v6.0-iio-adc-qcom-spmi-adc5-add-ADC5_VREF_VADC-to-rev2-AD.patch b/target/linux/ipq60xx/patches-5.15/0038-v6.0-iio-adc-qcom-spmi-adc5-add-ADC5_VREF_VADC-to-rev2-AD.patch
index 4efbdcbfe..a619a291f 100644
--- a/target/linux/ipq60xx/patches-5.15/0038-v6.0-iio-adc-qcom-spmi-adc5-add-ADC5_VREF_VADC-to-rev2-AD.patch
+++ b/target/linux/ipq60xx/patches-5.15/0038-v6.0-iio-adc-qcom-spmi-adc5-add-ADC5_VREF_VADC-to-rev2-AD.patch
@@ -14,11 +14,9 @@ Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
  drivers/iio/adc/qcom-spmi-adc5.c | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/drivers/iio/adc/qcom-spmi-adc5.c b/drivers/iio/adc/qcom-spmi-adc5.c
-index 87438d1e5c0b..7bd3745884f0 100644
 --- a/drivers/iio/adc/qcom-spmi-adc5.c
 +++ b/drivers/iio/adc/qcom-spmi-adc5.c
-@@ -589,6 +589,8 @@ static const struct adc5_channels adc5_chans_rev2[ADC5_MAX_CHANNEL] = {
+@@ -589,6 +589,8 @@ static const struct adc5_channels adc5_c
  					SCALE_HW_CALIB_DEFAULT)
  	[ADC5_1P25VREF]		= ADC5_CHAN_VOLT("vref_1p25", 0,
  					SCALE_HW_CALIB_DEFAULT)
@@ -27,6 +25,3 @@ index 87438d1e5c0b..7bd3745884f0 100644
  	[ADC5_VPH_PWR]		= ADC5_CHAN_VOLT("vph_pwr", 1,
  					SCALE_HW_CALIB_DEFAULT)
  	[ADC5_VBAT_SNS]		= ADC5_CHAN_VOLT("vbat_sns", 1,
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0039-v6.0-phy-qcom-qmp-pcie-make-pipe-clock-rate-configurable.patch b/target/linux/ipq60xx/patches-5.15/0039-v6.0-phy-qcom-qmp-pcie-make-pipe-clock-rate-configurable.patch
index ee9e6c862..390dc52b0 100644
--- a/target/linux/ipq60xx/patches-5.15/0039-v6.0-phy-qcom-qmp-pcie-make-pipe-clock-rate-configurable.patch
+++ b/target/linux/ipq60xx/patches-5.15/0039-v6.0-phy-qcom-qmp-pcie-make-pipe-clock-rate-configurable.patch
@@ -15,8 +15,6 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
  drivers/phy/qualcomm/phy-qcom-qmp.c | 14 ++++++++++++--
  1 file changed, 12 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
-index ed69d455ac0e..4a0e8dd9c97d 100644
 --- a/drivers/phy/qualcomm/phy-qcom-qmp.c
 +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
 @@ -2842,6 +2842,9 @@ struct qmp_phy_cfg {
@@ -29,7 +27,7 @@ index ed69d455ac0e..4a0e8dd9c97d 100644
  	/* true, if PCS block has no separate SW_RESET register */
  	bool no_pcs_sw_reset;
  };
-@@ -5138,8 +5141,15 @@ static int phy_pipe_clk_register(struct qcom_qmp *qmp, struct device_node *np)
+@@ -5138,8 +5141,15 @@ static int phy_pipe_clk_register(struct
  
  	init.ops = &clk_fixed_rate_ops;
  
@@ -47,6 +45,3 @@ index ed69d455ac0e..4a0e8dd9c97d 100644
  	fixed->hw.init = &init;
  
  	ret = devm_clk_hw_register(qmp->dev, &fixed->hw);
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0040-v6.0-phy-qcom-qmp-pcie-add-IPQ8074-PCIe-Gen3-QMP-PHY-supp.patch b/target/linux/ipq60xx/patches-5.15/0040-v6.0-phy-qcom-qmp-pcie-add-IPQ8074-PCIe-Gen3-QMP-PHY-supp.patch
index 86019d5eb..655d4d24a 100644
--- a/target/linux/ipq60xx/patches-5.15/0040-v6.0-phy-qcom-qmp-pcie-add-IPQ8074-PCIe-Gen3-QMP-PHY-supp.patch
+++ b/target/linux/ipq60xx/patches-5.15/0040-v6.0-phy-qcom-qmp-pcie-add-IPQ8074-PCIe-Gen3-QMP-PHY-supp.patch
@@ -16,11 +16,9 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
  drivers/phy/qualcomm/phy-qcom-qmp.c | 160 ++++++++++++++++++++++++++++
  1 file changed, 160 insertions(+)
 
-diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
-index 4a0e8dd9c97d..0219a34f1047 100644
 --- a/drivers/phy/qualcomm/phy-qcom-qmp.c
 +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
-@@ -812,6 +812,133 @@ static const struct qmp_phy_init_tbl ipq8074_pcie_pcs_tbl[] = {
+@@ -812,6 +812,133 @@ static const struct qmp_phy_init_tbl ipq
  	QMP_PHY_INIT_CFG_L(QPHY_START_CTRL, 0x3),
  };
  
@@ -154,7 +152,7 @@ index 4a0e8dd9c97d..0219a34f1047 100644
  static const struct qmp_phy_init_tbl sdm845_qmp_pcie_serdes_tbl[] = {
  	QMP_PHY_INIT_CFG(QSERDES_V3_COM_BIAS_EN_CLKBUFLR_EN, 0x14),
  	QMP_PHY_INIT_CFG(QSERDES_V3_COM_CLK_SELECT, 0x30),
-@@ -3167,6 +3294,36 @@ static const struct qmp_phy_cfg ipq8074_pciephy_cfg = {
+@@ -3167,6 +3294,36 @@ static const struct qmp_phy_cfg ipq8074_
  	.pwrdn_delay_max	= 1005,		/* us */
  };
  
@@ -191,16 +189,13 @@ index 4a0e8dd9c97d..0219a34f1047 100644
  static const struct qmp_phy_cfg ipq6018_pciephy_cfg = {
  	.type			= PHY_TYPE_PCIE,
  	.nlanes			= 1,
-@@ -5542,6 +5699,9 @@ static const struct of_device_id qcom_qmp_phy_of_match_table[] = {
- 	}, {
+@@ -5543,6 +5700,9 @@ static const struct of_device_id qcom_qm
  		.compatible = "qcom,ipq8074-qmp-pcie-phy",
  		.data = &ipq8074_pciephy_cfg,
-+	}, {
+ 	}, {
 +		.compatible = "qcom,ipq8074-qmp-gen3-pcie-phy",
 +		.data = &ipq8074_pciephy_gen3_cfg,
- 	}, {
++	}, {
  		.compatible = "qcom,ipq6018-qmp-pcie-phy",
  		.data = &ipq6018_pciephy_cfg,
--- 
-2.37.2
-
+ 	}, {
diff --git a/target/linux/ipq60xx/patches-5.15/0041-v5.16-soc-qcom-socinfo-Add-IPQ8074-family-ID-s.patch b/target/linux/ipq60xx/patches-5.15/0041-v5.16-soc-qcom-socinfo-Add-IPQ8074-family-ID-s.patch
index 391930732..085fab079 100644
--- a/target/linux/ipq60xx/patches-5.15/0041-v5.16-soc-qcom-socinfo-Add-IPQ8074-family-ID-s.patch
+++ b/target/linux/ipq60xx/patches-5.15/0041-v5.16-soc-qcom-socinfo-Add-IPQ8074-family-ID-s.patch
@@ -14,8 +14,6 @@ Link: https://lore.kernel.org/r/20210905171131.660885-1-robimarko@gmail.com
  drivers/soc/qcom/socinfo.c | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
-diff --git a/drivers/soc/qcom/socinfo.c b/drivers/soc/qcom/socinfo.c
-index 5beb452f2401..302a6a895c2f 100644
 --- a/drivers/soc/qcom/socinfo.c
 +++ b/drivers/soc/qcom/socinfo.c
 @@ -281,19 +281,31 @@ static const struct soc_id soc_id[] = {
@@ -50,6 +48,3 @@ index 5beb452f2401..302a6a895c2f 100644
  	{ 402, "IPQ6018" },
  	{ 403, "IPQ6028" },
  	{ 421, "IPQ6000" },
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0042-v6.0-PCI-dwc-tegra-move-GEN3_RELATED-DBI-register-to-comm.patch b/target/linux/ipq60xx/patches-5.15/0042-v6.0-PCI-dwc-tegra-move-GEN3_RELATED-DBI-register-to-comm.patch
index 61f6f21c4..716e3a908 100644
--- a/target/linux/ipq60xx/patches-5.15/0042-v6.0-PCI-dwc-tegra-move-GEN3_RELATED-DBI-register-to-comm.patch
+++ b/target/linux/ipq60xx/patches-5.15/0042-v6.0-PCI-dwc-tegra-move-GEN3_RELATED-DBI-register-to-comm.patch
@@ -13,8 +13,6 @@ Signed-off-by: Baruch Siach <baruch.siach@siklu.com>
  drivers/pci/controller/dwc/pcie-tegra194.c   | 6 ------
  2 files changed, 6 insertions(+), 6 deletions(-)
 
-diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h
-index 7d6e9b7576be..ea87809ee298 100644
 --- a/drivers/pci/controller/dwc/pcie-designware.h
 +++ b/drivers/pci/controller/dwc/pcie-designware.h
 @@ -74,6 +74,12 @@
@@ -30,8 +28,6 @@ index 7d6e9b7576be..ea87809ee298 100644
  #define PCIE_PORT_MULTI_LANE_CTRL	0x8C0
  #define PORT_MLTI_UPCFG_SUPPORT		BIT(7)
  
-diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
-index bdd84765e646..1381b00702fa 100644
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
 @@ -193,12 +193,6 @@
@@ -47,6 +43,3 @@ index bdd84765e646..1381b00702fa 100644
  #define PORT_LOGIC_AMBA_ERROR_RESPONSE_DEFAULT	0x8D0
  #define AMBA_ERROR_RESPONSE_CRS_SHIFT		3
  #define AMBA_ERROR_RESPONSE_CRS_MASK		GENMASK(1, 0)
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0043-v6.0-PCI-qcom-Define-slot-capabilities-using-PCI_EXP_SLTC.patch b/target/linux/ipq60xx/patches-5.15/0043-v6.0-PCI-qcom-Define-slot-capabilities-using-PCI_EXP_SLTC.patch
index 8e857a797..d84839f2b 100644
--- a/target/linux/ipq60xx/patches-5.15/0043-v6.0-PCI-qcom-Define-slot-capabilities-using-PCI_EXP_SLTC.patch
+++ b/target/linux/ipq60xx/patches-5.15/0043-v6.0-PCI-qcom-Define-slot-capabilities-using-PCI_EXP_SLTC.patch
@@ -13,8 +13,6 @@ Signed-off-by: Baruch Siach <baruch.siach@siklu.com>
  drivers/pci/controller/dwc/pcie-qcom.c | 15 +++++++++++++--
  1 file changed, 13 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
-index 4c599699e3c8..f49de615c9c4 100644
 --- a/drivers/pci/controller/dwc/pcie-qcom.c
 +++ b/drivers/pci/controller/dwc/pcie-qcom.c
 @@ -69,7 +69,18 @@
@@ -37,7 +35,7 @@ index 4c599699e3c8..f49de615c9c4 100644
  
  #define PCIE20_PARF_Q2A_FLUSH			0x1AC
  
-@@ -1125,7 +1136,7 @@ static int qcom_pcie_post_init_2_3_3(struct qcom_pcie *pcie)
+@@ -1125,7 +1136,7 @@ static int qcom_pcie_post_init_2_3_3(str
  
  	writel(PCI_COMMAND_MASTER, pci->dbi_base + PCI_COMMAND);
  	writel(DBI_RO_WR_EN, pci->dbi_base + PCIE20_MISC_CONTROL_1_REG);
@@ -46,6 +44,3 @@ index 4c599699e3c8..f49de615c9c4 100644
  
  	val = readl(pci->dbi_base + offset + PCI_EXP_LNKCAP);
  	val &= ~PCI_EXP_LNKCAP_ASPMS;
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0044-v6.0-PCI-qcom-Add-IPQ60xx-support.patch b/target/linux/ipq60xx/patches-5.15/0044-v6.0-PCI-qcom-Add-IPQ60xx-support.patch
index a5ec337c8..93bec2f04 100644
--- a/target/linux/ipq60xx/patches-5.15/0044-v6.0-PCI-qcom-Add-IPQ60xx-support.patch
+++ b/target/linux/ipq60xx/patches-5.15/0044-v6.0-PCI-qcom-Add-IPQ60xx-support.patch
@@ -21,8 +21,6 @@ Signed-off-by: Baruch Siach <baruch.siach@siklu.com>
  drivers/pci/controller/dwc/pcie-qcom.c       | 135 +++++++++++++++++++
  2 files changed, 136 insertions(+)
 
-diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h
-index ea87809ee298..279c3778a13b 100644
 --- a/drivers/pci/controller/dwc/pcie-designware.h
 +++ b/drivers/pci/controller/dwc/pcie-designware.h
 @@ -76,6 +76,7 @@
@@ -33,8 +31,6 @@ index ea87809ee298..279c3778a13b 100644
  #define GEN3_RELATED_OFF_GEN3_EQ_DISABLE	BIT(16)
  #define GEN3_RELATED_OFF_RATE_SHADOW_SEL_SHIFT	24
  #define GEN3_RELATED_OFF_RATE_SHADOW_SEL_MASK	GENMASK(25, 24)
-diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
-index f49de615c9c4..f50de3408add 100644
 --- a/drivers/pci/controller/dwc/pcie-qcom.c
 +++ b/drivers/pci/controller/dwc/pcie-qcom.c
 @@ -52,6 +52,10 @@
@@ -68,7 +64,7 @@ index f49de615c9c4..f50de3408add 100644
  };
  
  struct qcom_pcie;
-@@ -1276,6 +1286,121 @@ static void qcom_pcie_post_deinit_2_7_0(struct qcom_pcie *pcie)
+@@ -1276,6 +1286,121 @@ static void qcom_pcie_post_deinit_2_7_0(
  	clk_disable_unprepare(res->pipe_clk);
  }
  
@@ -190,7 +186,7 @@ index f49de615c9c4..f50de3408add 100644
  static int qcom_pcie_link_up(struct dw_pcie *pci)
  {
  	u16 offset = dw_pcie_find_capability(pci, PCI_CAP_ID_EXP);
-@@ -1467,6 +1592,15 @@ static const struct qcom_pcie_ops ops_1_9_0 = {
+@@ -1467,6 +1592,15 @@ static const struct qcom_pcie_ops ops_1_
  	.config_sid = qcom_pcie_config_sid_sm8250,
  };
  
@@ -206,7 +202,7 @@ index f49de615c9c4..f50de3408add 100644
  static const struct dw_pcie_ops dw_pcie_ops = {
  	.link_up = qcom_pcie_link_up,
  	.start_link = qcom_pcie_start_link,
-@@ -1565,6 +1699,7 @@ static const struct of_device_id qcom_pcie_match[] = {
+@@ -1565,6 +1699,7 @@ static const struct of_device_id qcom_pc
  	{ .compatible = "qcom,pcie-qcs404", .data = &ops_2_4_0 },
  	{ .compatible = "qcom,pcie-sdm845", .data = &ops_2_7_0 },
  	{ .compatible = "qcom,pcie-sm8250", .data = &ops_1_9_0 },
@@ -214,6 +210,3 @@ index f49de615c9c4..f50de3408add 100644
  	{ }
  };
  
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0100-arm64-dts-ipq8074-add-reserved-memory-nodes.patch b/target/linux/ipq60xx/patches-5.15/0100-arm64-dts-ipq8074-add-reserved-memory-nodes.patch
index 225b84c1d..314db03b2 100644
--- a/target/linux/ipq60xx/patches-5.15/0100-arm64-dts-ipq8074-add-reserved-memory-nodes.patch
+++ b/target/linux/ipq60xx/patches-5.15/0100-arm64-dts-ipq8074-add-reserved-memory-nodes.patch
@@ -17,11 +17,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 35 +++++++++++++++++++++++++++
  1 file changed, 35 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index d53675fc1595..5985dfff073d 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -85,6 +85,26 @@ reserved-memory {
+@@ -85,6 +85,26 @@
  		#size-cells = <2>;
  		ranges;
  
@@ -48,7 +46,7 @@ index d53675fc1595..5985dfff073d 100644
  		smem@4ab00000 {
  			compatible = "qcom,smem";
  			reg = <0x0 0x4ab00000 0x0 0x00100000>;
-@@ -97,6 +117,21 @@ memory@4ac00000 {
+@@ -97,6 +117,21 @@
  			no-map;
  			reg = <0x0 0x4ac00000 0x0 0x00400000>;
  		};
@@ -70,6 +68,3 @@ index d53675fc1595..5985dfff073d 100644
  	};
  
  	firmware {
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0101-clk-qcom-clk-rcg2-add-rcg2-mux-ops.patch b/target/linux/ipq60xx/patches-5.15/0101-clk-qcom-clk-rcg2-add-rcg2-mux-ops.patch
index 2a991eced..6e210c430 100644
--- a/target/linux/ipq60xx/patches-5.15/0101-clk-qcom-clk-rcg2-add-rcg2-mux-ops.patch
+++ b/target/linux/ipq60xx/patches-5.15/0101-clk-qcom-clk-rcg2-add-rcg2-mux-ops.patch
@@ -21,8 +21,6 @@ Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
  drivers/clk/qcom/clk-rcg2.c | 7 +++++++
  2 files changed, 8 insertions(+)
 
-diff --git a/drivers/clk/qcom/clk-rcg.h b/drivers/clk/qcom/clk-rcg.h
-index 99efcc7f8d88..248115a018bc 100644
 --- a/drivers/clk/qcom/clk-rcg.h
 +++ b/drivers/clk/qcom/clk-rcg.h
 @@ -164,6 +164,7 @@ struct clk_rcg2_gfx3d {
@@ -33,11 +31,9 @@ index 99efcc7f8d88..248115a018bc 100644
  extern const struct clk_ops clk_edp_pixel_ops;
  extern const struct clk_ops clk_byte_ops;
  extern const struct clk_ops clk_byte2_ops;
-diff --git a/drivers/clk/qcom/clk-rcg2.c b/drivers/clk/qcom/clk-rcg2.c
-index c3823cc32edc..fdbbda1f2ba4 100644
 --- a/drivers/clk/qcom/clk-rcg2.c
 +++ b/drivers/clk/qcom/clk-rcg2.c
-@@ -477,6 +477,13 @@ const struct clk_ops clk_rcg2_floor_ops = {
+@@ -477,6 +477,13 @@ const struct clk_ops clk_rcg2_floor_ops
  };
  EXPORT_SYMBOL_GPL(clk_rcg2_floor_ops);
  
@@ -51,6 +47,3 @@ index c3823cc32edc..fdbbda1f2ba4 100644
  struct frac_entry {
  	int num;
  	int den;
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0102-clk-qcom-apss-ipq6018-fix-apcs_alias0_clk_src.patch b/target/linux/ipq60xx/patches-5.15/0102-clk-qcom-apss-ipq6018-fix-apcs_alias0_clk_src.patch
index 301a04101..9f05a72f1 100644
--- a/target/linux/ipq60xx/patches-5.15/0102-clk-qcom-apss-ipq6018-fix-apcs_alias0_clk_src.patch
+++ b/target/linux/ipq60xx/patches-5.15/0102-clk-qcom-apss-ipq6018-fix-apcs_alias0_clk_src.patch
@@ -26,8 +26,6 @@ Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
  drivers/clk/qcom/apss-ipq6018.c | 13 ++++++-------
  1 file changed, 6 insertions(+), 7 deletions(-)
 
-diff --git a/drivers/clk/qcom/apss-ipq6018.c b/drivers/clk/qcom/apss-ipq6018.c
-index d78ff2f310bf..be952d417ded 100644
 --- a/drivers/clk/qcom/apss-ipq6018.c
 +++ b/drivers/clk/qcom/apss-ipq6018.c
 @@ -16,7 +16,7 @@
@@ -39,7 +37,7 @@ index d78ff2f310bf..be952d417ded 100644
  
  enum {
  	P_XO,
-@@ -33,16 +33,15 @@ static const struct parent_map parents_apcs_alias0_clk_src_map[] = {
+@@ -33,16 +33,15 @@ static const struct parent_map parents_a
  	{ P_APSS_PLL_EARLY, 5 },
  };
  
@@ -61,6 +59,3 @@ index d78ff2f310bf..be952d417ded 100644
  		.flags = CLK_SET_RATE_PARENT,
  	},
  };
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0104-clk-qcom-apss-ipq-pll-use-OF-match-data-for-Alpha-PL.patch b/target/linux/ipq60xx/patches-5.15/0104-clk-qcom-apss-ipq-pll-use-OF-match-data-for-Alpha-PL.patch
index 6de4a4223..18ba654a0 100644
--- a/target/linux/ipq60xx/patches-5.15/0104-clk-qcom-apss-ipq-pll-use-OF-match-data-for-Alpha-PL.patch
+++ b/target/linux/ipq60xx/patches-5.15/0104-clk-qcom-apss-ipq-pll-use-OF-match-data-for-Alpha-PL.patch
@@ -17,8 +17,6 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  drivers/clk/qcom/apss-ipq-pll.c | 12 +++++++++---
  1 file changed, 9 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/clk/qcom/apss-ipq-pll.c b/drivers/clk/qcom/apss-ipq-pll.c
-index bef7899ad0d6..ba77749b16c4 100644
 --- a/drivers/clk/qcom/apss-ipq-pll.c
 +++ b/drivers/clk/qcom/apss-ipq-pll.c
 @@ -2,6 +2,7 @@
@@ -38,7 +36,7 @@ index bef7899ad0d6..ba77749b16c4 100644
  	.l = 0x37,
  	.config_ctl_val = 0x04141200,
  	.config_ctl_hi_val = 0x0,
-@@ -54,6 +55,7 @@ static const struct regmap_config ipq_pll_regmap_config = {
+@@ -54,6 +55,7 @@ static const struct regmap_config ipq_pl
  
  static int apss_ipq_pll_probe(struct platform_device *pdev)
  {
@@ -46,7 +44,7 @@ index bef7899ad0d6..ba77749b16c4 100644
  	struct device *dev = &pdev->dev;
  	struct regmap *regmap;
  	void __iomem *base;
-@@ -67,7 +69,11 @@ static int apss_ipq_pll_probe(struct platform_device *pdev)
+@@ -67,7 +69,11 @@ static int apss_ipq_pll_probe(struct pla
  	if (IS_ERR(regmap))
  		return PTR_ERR(regmap);
  
@@ -59,7 +57,7 @@ index bef7899ad0d6..ba77749b16c4 100644
  
  	ret = devm_clk_register_regmap(dev, &ipq_pll.clkr);
  	if (ret)
-@@ -78,7 +84,7 @@ static int apss_ipq_pll_probe(struct platform_device *pdev)
+@@ -78,7 +84,7 @@ static int apss_ipq_pll_probe(struct pla
  }
  
  static const struct of_device_id apss_ipq_pll_match_table[] = {
@@ -68,6 +66,3 @@ index bef7899ad0d6..ba77749b16c4 100644
  	{ }
  };
  MODULE_DEVICE_TABLE(of, apss_ipq_pll_match_table);
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0105-clk-qcom-apss-ipq-pll-update-IPQ6018-Alpha-PLL-confi.patch b/target/linux/ipq60xx/patches-5.15/0105-clk-qcom-apss-ipq-pll-update-IPQ6018-Alpha-PLL-confi.patch
index 46854e53c..6a84c13cc 100644
--- a/target/linux/ipq60xx/patches-5.15/0105-clk-qcom-apss-ipq-pll-update-IPQ6018-Alpha-PLL-confi.patch
+++ b/target/linux/ipq60xx/patches-5.15/0105-clk-qcom-apss-ipq-pll-update-IPQ6018-Alpha-PLL-confi.patch
@@ -17,8 +17,6 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  drivers/clk/qcom/apss-ipq-pll.c | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/clk/qcom/apss-ipq-pll.c b/drivers/clk/qcom/apss-ipq-pll.c
-index ba77749b16c4..a4016f3854c2 100644
 --- a/drivers/clk/qcom/apss-ipq-pll.c
 +++ b/drivers/clk/qcom/apss-ipq-pll.c
 @@ -39,10 +39,14 @@ static struct clk_alpha_pll ipq_pll = {
@@ -38,6 +36,3 @@ index ba77749b16c4..a4016f3854c2 100644
  };
  
  static const struct regmap_config ipq_pll_regmap_config = {
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0106-clk-qcom-apss-ipq-pll-add-support-for-IPQ8074.patch b/target/linux/ipq60xx/patches-5.15/0106-clk-qcom-apss-ipq-pll-add-support-for-IPQ8074.patch
index 0e5fdddb4..f59ce60c8 100644
--- a/target/linux/ipq60xx/patches-5.15/0106-clk-qcom-apss-ipq-pll-add-support-for-IPQ8074.patch
+++ b/target/linux/ipq60xx/patches-5.15/0106-clk-qcom-apss-ipq-pll-add-support-for-IPQ8074.patch
@@ -20,11 +20,9 @@ utilize match data provided by previous commit
  drivers/clk/qcom/apss-ipq-pll.c | 13 +++++++++++++
  1 file changed, 13 insertions(+)
 
-diff --git a/drivers/clk/qcom/apss-ipq-pll.c b/drivers/clk/qcom/apss-ipq-pll.c
-index a4016f3854c2..a5aea27eb867 100644
 --- a/drivers/clk/qcom/apss-ipq-pll.c
 +++ b/drivers/clk/qcom/apss-ipq-pll.c
-@@ -49,6 +49,18 @@ static const struct alpha_pll_config ipq6018_pll_config = {
+@@ -49,6 +49,18 @@ static const struct alpha_pll_config ipq
  	.test_ctl_hi_val = 0x4000,
  };
  
@@ -43,7 +41,7 @@ index a4016f3854c2..a5aea27eb867 100644
  static const struct regmap_config ipq_pll_regmap_config = {
  	.reg_bits		= 32,
  	.reg_stride		= 4,
-@@ -89,6 +101,7 @@ static int apss_ipq_pll_probe(struct platform_device *pdev)
+@@ -89,6 +101,7 @@ static int apss_ipq_pll_probe(struct pla
  
  static const struct of_device_id apss_ipq_pll_match_table[] = {
  	{ .compatible = "qcom,ipq6018-a53pll", .data = &ipq6018_pll_config },
@@ -51,6 +49,3 @@ index a4016f3854c2..a5aea27eb867 100644
  	{ }
  };
  MODULE_DEVICE_TABLE(of, apss_ipq_pll_match_table);
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0107-arm64-dts-qcom-ipq8074-correct-APCS-register-space-s.patch b/target/linux/ipq60xx/patches-5.15/0107-arm64-dts-qcom-ipq8074-correct-APCS-register-space-s.patch
index 8bf69e7e2..01a4acc9a 100644
--- a/target/linux/ipq60xx/patches-5.15/0107-arm64-dts-qcom-ipq8074-correct-APCS-register-space-s.patch
+++ b/target/linux/ipq60xx/patches-5.15/0107-arm64-dts-qcom-ipq8074-correct-APCS-register-space-s.patch
@@ -18,11 +18,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  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 5985dfff073d..5b62d7590fc6 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -703,7 +703,7 @@ watchdog: watchdog@b017000 {
+@@ -703,7 +703,7 @@
  
  		apcs_glb: mailbox@b111000 {
  			compatible = "qcom,ipq8074-apcs-apps-global";
@@ -31,6 +29,3 @@ index 5985dfff073d..5b62d7590fc6 100644
  
  			#clock-cells = <1>;
  			#mbox-cells = <1>;
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0108-arm64-dts-qcom-ipq8074-add-A53-PLL-node.patch b/target/linux/ipq60xx/patches-5.15/0108-arm64-dts-qcom-ipq8074-add-A53-PLL-node.patch
index 25b02e3e3..fbbe3fd97 100644
--- a/target/linux/ipq60xx/patches-5.15/0108-arm64-dts-qcom-ipq8074-add-A53-PLL-node.patch
+++ b/target/linux/ipq60xx/patches-5.15/0108-arm64-dts-qcom-ipq8074-add-A53-PLL-node.patch
@@ -11,11 +11,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 8 ++++++++
  1 file changed, 8 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 5b62d7590fc6..bace14b742a1 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -709,6 +709,14 @@ apcs_glb: mailbox@b111000 {
+@@ -709,6 +709,14 @@
  			#mbox-cells = <1>;
  		};
  
@@ -30,6 +28,3 @@ index 5b62d7590fc6..bace14b742a1 100644
  		timer@b120000 {
  			#address-cells = <1>;
  			#size-cells = <1>;
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0109-mailbox-qcom-apcs-ipc-add-IPQ8074-APSS-clock-support.patch b/target/linux/ipq60xx/patches-5.15/0109-mailbox-qcom-apcs-ipc-add-IPQ8074-APSS-clock-support.patch
index a7899dd1c..32a9faafe 100644
--- a/target/linux/ipq60xx/patches-5.15/0109-mailbox-qcom-apcs-ipc-add-IPQ8074-APSS-clock-support.patch
+++ b/target/linux/ipq60xx/patches-5.15/0109-mailbox-qcom-apcs-ipc-add-IPQ8074-APSS-clock-support.patch
@@ -26,11 +26,9 @@ Changes in v5:
  drivers/mailbox/qcom-apcs-ipc-mailbox.c | 6 +-----
  1 file changed, 1 insertion(+), 5 deletions(-)
 
-diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
-index 82ccfaf14b24..0d8d1b17ba45 100644
 --- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c
 +++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
-@@ -33,10 +33,6 @@ static const struct qcom_apcs_ipc_data ipq6018_apcs_data = {
+@@ -33,10 +33,6 @@ static const struct qcom_apcs_ipc_data i
  	.offset = 8, .clk_name = "qcom,apss-ipq6018-clk"
  };
  
@@ -41,7 +39,7 @@ index 82ccfaf14b24..0d8d1b17ba45 100644
  static const struct qcom_apcs_ipc_data msm8916_apcs_data = {
  	.offset = 8, .clk_name = "qcom-apcs-msm8916-clk"
  };
-@@ -160,7 +156,7 @@ static int qcom_apcs_ipc_remove(struct platform_device *pdev)
+@@ -160,7 +156,7 @@ static int qcom_apcs_ipc_remove(struct p
  /* .data is the offset of the ipc register within the global block */
  static const struct of_device_id qcom_apcs_ipc_of_match[] = {
  	{ .compatible = "qcom,ipq6018-apcs-apps-global", .data = &ipq6018_apcs_data },
@@ -50,6 +48,3 @@ index 82ccfaf14b24..0d8d1b17ba45 100644
  	{ .compatible = "qcom,msm8916-apcs-kpss-global", .data = &msm8916_apcs_data },
  	{ .compatible = "qcom,msm8939-apcs-kpss-global", .data = &msm8916_apcs_data },
  	{ .compatible = "qcom,msm8953-apcs-kpss-global", .data = &msm8994_apcs_data },
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0110-arm64-dts-qcom-ipq8074-add-clocks-to-APCS.patch b/target/linux/ipq60xx/patches-5.15/0110-arm64-dts-qcom-ipq8074-add-clocks-to-APCS.patch
index 331b3c79a..70f8da091 100644
--- a/target/linux/ipq60xx/patches-5.15/0110-arm64-dts-qcom-ipq8074-add-clocks-to-APCS.patch
+++ b/target/linux/ipq60xx/patches-5.15/0110-arm64-dts-qcom-ipq8074-add-clocks-to-APCS.patch
@@ -14,11 +14,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index bace14b742a1..7d4ff7d8a239 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -704,8 +704,9 @@ watchdog: watchdog@b017000 {
+@@ -704,8 +704,9 @@
  		apcs_glb: mailbox@b111000 {
  			compatible = "qcom,ipq8074-apcs-apps-global";
  			reg = <0x0b111000 0x1000>;
@@ -29,6 +27,3 @@ index bace14b742a1..7d4ff7d8a239 100644
  			#mbox-cells = <1>;
  		};
  
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0111-PCI-qcom-add-IPQ8074-Gen3-support.patch b/target/linux/ipq60xx/patches-5.15/0111-PCI-qcom-add-IPQ8074-Gen3-support.patch
index afa76389e..3a3c5b84a 100644
--- a/target/linux/ipq60xx/patches-5.15/0111-PCI-qcom-add-IPQ8074-Gen3-support.patch
+++ b/target/linux/ipq60xx/patches-5.15/0111-PCI-qcom-add-IPQ8074-Gen3-support.patch
@@ -11,8 +11,6 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  drivers/pci/controller/dwc/pcie-qcom.c | 9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
-index f50de3408add..5aec3510b5c9 100644
 --- a/drivers/pci/controller/dwc/pcie-qcom.c
 +++ b/drivers/pci/controller/dwc/pcie-qcom.c
 @@ -184,7 +184,7 @@ struct qcom_pcie_resources_2_7_0 {
@@ -24,7 +22,7 @@ index f50de3408add..5aec3510b5c9 100644
  	struct reset_control *rst;
  };
  
-@@ -1296,8 +1296,10 @@ static int qcom_pcie_get_resources_2_9_0(struct qcom_pcie *pcie)
+@@ -1296,8 +1296,10 @@ static int qcom_pcie_get_resources_2_9_0
  	res->clks[0].id = "iface";
  	res->clks[1].id = "axi_m";
  	res->clks[2].id = "axi_s";
@@ -37,7 +35,7 @@ index f50de3408add..5aec3510b5c9 100644
  
  	ret = devm_clk_bulk_get(dev, ARRAY_SIZE(res->clks), res->clks);
  	if (ret < 0)
-@@ -1700,6 +1702,7 @@ static const struct of_device_id qcom_pcie_match[] = {
+@@ -1700,6 +1702,7 @@ static const struct of_device_id qcom_pc
  	{ .compatible = "qcom,pcie-sdm845", .data = &ops_2_7_0 },
  	{ .compatible = "qcom,pcie-sm8250", .data = &ops_1_9_0 },
  	{ .compatible = "qcom,pcie-ipq6018", .data = &ops_2_9_0 },
@@ -45,6 +43,3 @@ index f50de3408add..5aec3510b5c9 100644
  	{ }
  };
  
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0112-arm64-dts-ipq8074-fix-PCI-related-DT-nodes.patch b/target/linux/ipq60xx/patches-5.15/0112-arm64-dts-ipq8074-fix-PCI-related-DT-nodes.patch
index 9f2aa643e..fa31c462f 100644
--- a/target/linux/ipq60xx/patches-5.15/0112-arm64-dts-ipq8074-fix-PCI-related-DT-nodes.patch
+++ b/target/linux/ipq60xx/patches-5.15/0112-arm64-dts-ipq8074-fix-PCI-related-DT-nodes.patch
@@ -14,11 +14,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 93 +++++++++++++++------------
  1 file changed, 52 insertions(+), 41 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 7d4ff7d8a239..019c8e302273 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -232,59 +232,61 @@ qusb_phy_0: phy@79000 {
+@@ -232,59 +232,61 @@
  			status = "disabled";
  		};
  
@@ -100,7 +98,7 @@ index 7d4ff7d8a239..019c8e302273 100644
  			};
  		};
  
-@@ -686,7 +688,7 @@ intc: interrupt-controller@b000000 {
+@@ -686,7 +688,7 @@
  			reg = <0x0b000000 0x1000>, <0x0b002000 0x1000>;
  			ranges = <0 0xb00a000 0xffd>;
  
@@ -109,7 +107,7 @@ index 7d4ff7d8a239..019c8e302273 100644
  				compatible = "arm,gic-v2m-frame";
  				msi-controller;
  				reg = <0x0 0xffd>;
-@@ -787,6 +789,7 @@ pcie1: pci@10000000 {
+@@ -787,6 +789,7 @@
  			linux,pci-domain = <1>;
  			bus-range = <0x00 0xff>;
  			num-lanes = <1>;
@@ -117,7 +115,7 @@ index 7d4ff7d8a239..019c8e302273 100644
  			#address-cells = <3>;
  			#size-cells = <2>;
  
-@@ -794,12 +797,12 @@ pcie1: pci@10000000 {
+@@ -794,12 +797,12 @@
  			phy-names = "pciephy";
  
  			ranges = <0x81000000 0 0x10200000 0x10200000
@@ -135,7 +133,7 @@ index 7d4ff7d8a239..019c8e302273 100644
  			#interrupt-cells = <1>;
  			interrupt-map-mask = <0 0 0 0x7>;
  			interrupt-map = <0 0 0 1 &intc 0 142
-@@ -839,16 +842,18 @@ IRQ_TYPE_LEVEL_HIGH>, /* int_c */
+@@ -839,16 +842,18 @@
  		};
  
  		pcie0: pci@20000000 {
@@ -160,7 +158,7 @@ index 7d4ff7d8a239..019c8e302273 100644
  			#address-cells = <3>;
  			#size-cells = <2>;
  
-@@ -856,12 +861,12 @@ pcie0: pci@20000000 {
+@@ -856,12 +861,12 @@
  			phy-names = "pciephy";
  
  			ranges = <0x81000000 0 0x20200000 0x20200000
@@ -178,7 +176,7 @@ index 7d4ff7d8a239..019c8e302273 100644
  			#interrupt-cells = <1>;
  			interrupt-map-mask = <0 0 0 0x7>;
  			interrupt-map = <0 0 0 1 &intc 0 75
-@@ -877,27 +882,33 @@ IRQ_TYPE_LEVEL_HIGH>, /* int_c */
+@@ -877,27 +882,33 @@
  				 <&gcc GCC_PCIE0_AXI_M_CLK>,
  				 <&gcc GCC_PCIE0_AXI_S_CLK>,
  				 <&gcc GCC_PCIE0_AHB_CLK>,
@@ -216,6 +214,3 @@ index 7d4ff7d8a239..019c8e302273 100644
  			status = "disabled";
  		};
  	};
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0113-remoteproc-qcom-Add-PRNG-proxy-clock.patch b/target/linux/ipq60xx/patches-5.15/0113-remoteproc-qcom-Add-PRNG-proxy-clock.patch
index 8251f71d4..2a12cec48 100644
--- a/target/linux/ipq60xx/patches-5.15/0113-remoteproc-qcom-Add-PRNG-proxy-clock.patch
+++ b/target/linux/ipq60xx/patches-5.15/0113-remoteproc-qcom-Add-PRNG-proxy-clock.patch
@@ -13,8 +13,6 @@ Signed-off-by: Nikhil Prakash V <nprakash@codeaurora.org>
  drivers/remoteproc/qcom_q6v5_wcss.c | 65 +++++++++++++++++++++--------
  1 file changed, 47 insertions(+), 18 deletions(-)
 
-diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
-index 20d50ec7eff1..0e5484020296 100644
 --- a/drivers/remoteproc/qcom_q6v5_wcss.c
 +++ b/drivers/remoteproc/qcom_q6v5_wcss.c
 @@ -91,19 +91,6 @@ enum {
@@ -67,7 +65,7 @@ index 20d50ec7eff1..0e5484020296 100644
  static int q6v5_wcss_reset(struct q6v5_wcss *wcss)
  {
  	int ret;
-@@ -240,6 +243,12 @@ static int q6v5_wcss_start(struct rproc *rproc)
+@@ -240,6 +243,12 @@ static int q6v5_wcss_start(struct rproc
  	struct q6v5_wcss *wcss = rproc->priv;
  	int ret;
  
@@ -80,7 +78,7 @@ index 20d50ec7eff1..0e5484020296 100644
  	qcom_q6v5_prepare(&wcss->q6v5);
  
  	/* Release Q6 and WCSS reset */
-@@ -732,6 +741,7 @@ static int q6v5_wcss_stop(struct rproc *rproc)
+@@ -732,6 +741,7 @@ static int q6v5_wcss_stop(struct rproc *
  			return ret;
  	}
  
@@ -88,7 +86,7 @@ index 20d50ec7eff1..0e5484020296 100644
  	qcom_q6v5_unprepare(&wcss->q6v5);
  
  	return 0;
-@@ -896,7 +906,21 @@ static int q6v5_alloc_memory_region(struct q6v5_wcss *wcss)
+@@ -896,7 +906,21 @@ static int q6v5_alloc_memory_region(stru
  	return 0;
  }
  
@@ -111,7 +109,7 @@ index 20d50ec7eff1..0e5484020296 100644
  {
  	int ret;
  
-@@ -986,7 +1010,7 @@ static int q6v5_wcss_init_clock(struct q6v5_wcss *wcss)
+@@ -986,7 +1010,7 @@ static int q6v5_wcss_init_clock(struct q
  	return 0;
  }
  
@@ -120,7 +118,7 @@ index 20d50ec7eff1..0e5484020296 100644
  {
  	wcss->cx_supply = devm_regulator_get(wcss->dev, "cx");
  	if (IS_ERR(wcss->cx_supply))
-@@ -1030,12 +1054,14 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
+@@ -1030,12 +1054,14 @@ static int q6v5_wcss_probe(struct platfo
  	if (ret)
  		goto free_rproc;
  
@@ -138,7 +136,7 @@ index 20d50ec7eff1..0e5484020296 100644
  		if (ret)
  			goto free_rproc;
  	}
-@@ -1082,6 +1108,7 @@ static int q6v5_wcss_remove(struct platform_device *pdev)
+@@ -1082,6 +1108,7 @@ static int q6v5_wcss_remove(struct platf
  }
  
  static const struct wcss_data wcss_ipq8074_res_init = {
@@ -146,7 +144,7 @@ index 20d50ec7eff1..0e5484020296 100644
  	.firmware_name = "IPQ8074/q6_fw.mdt",
  	.crash_reason_smem = WCSS_CRASH_REASON,
  	.aon_reset_required = true,
-@@ -1091,6 +1118,8 @@ static const struct wcss_data wcss_ipq8074_res_init = {
+@@ -1091,6 +1118,8 @@ static const struct wcss_data wcss_ipq80
  };
  
  static const struct wcss_data wcss_qcs404_res_init = {
@@ -155,6 +153,3 @@ index 20d50ec7eff1..0e5484020296 100644
  	.crash_reason_smem = WCSS_CRASH_REASON,
  	.firmware_name = "wcnss.mdt",
  	.version = WCSS_QCS404,
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0114-remoteproc-qcom-Add-secure-PIL-support.patch b/target/linux/ipq60xx/patches-5.15/0114-remoteproc-qcom-Add-secure-PIL-support.patch
index ac329d847..7f466b45e 100644
--- a/target/linux/ipq60xx/patches-5.15/0114-remoteproc-qcom-Add-secure-PIL-support.patch
+++ b/target/linux/ipq60xx/patches-5.15/0114-remoteproc-qcom-Add-secure-PIL-support.patch
@@ -12,8 +12,6 @@ Signed-off-by: Nikhil Prakash V <nprakash@codeaurora.org>
  drivers/remoteproc/qcom_q6v5_wcss.c | 43 +++++++++++++++++++++++++++--
  1 file changed, 40 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
-index 0e5484020296..7d173b7816b8 100644
 --- a/drivers/remoteproc/qcom_q6v5_wcss.c
 +++ b/drivers/remoteproc/qcom_q6v5_wcss.c
 @@ -18,6 +18,7 @@
@@ -50,7 +48,7 @@ index 0e5484020296..7d173b7816b8 100644
  };
  
  static int q6v5_wcss_reset(struct q6v5_wcss *wcss)
-@@ -251,6 +257,15 @@ static int q6v5_wcss_start(struct rproc *rproc)
+@@ -251,6 +257,15 @@ static int q6v5_wcss_start(struct rproc
  
  	qcom_q6v5_prepare(&wcss->q6v5);
  
@@ -66,7 +64,7 @@ index 0e5484020296..7d173b7816b8 100644
  	/* Release Q6 and WCSS reset */
  	ret = reset_control_deassert(wcss->wcss_reset);
  	if (ret) {
-@@ -285,6 +300,7 @@ static int q6v5_wcss_start(struct rproc *rproc)
+@@ -285,6 +300,7 @@ static int q6v5_wcss_start(struct rproc
  	if (ret)
  		goto wcss_q6_reset;
  
@@ -74,7 +72,7 @@ index 0e5484020296..7d173b7816b8 100644
  	ret = qcom_q6v5_wait_for_start(&wcss->q6v5, 5 * HZ);
  	if (ret == -ETIMEDOUT)
  		dev_err(wcss->dev, "start timed out\n");
-@@ -717,6 +733,15 @@ static int q6v5_wcss_stop(struct rproc *rproc)
+@@ -717,6 +733,15 @@ static int q6v5_wcss_stop(struct rproc *
  	struct q6v5_wcss *wcss = rproc->priv;
  	int ret;
  
@@ -90,7 +88,7 @@ index 0e5484020296..7d173b7816b8 100644
  	/* WCSS powerdown */
  	if (wcss->requires_force_stop) {
  		ret = qcom_q6v5_request_stop(&wcss->q6v5, NULL);
-@@ -741,6 +766,7 @@ static int q6v5_wcss_stop(struct rproc *rproc)
+@@ -741,6 +766,7 @@ static int q6v5_wcss_stop(struct rproc *
  			return ret;
  	}
  
@@ -98,7 +96,7 @@ index 0e5484020296..7d173b7816b8 100644
  	clk_disable_unprepare(wcss->prng_clk);
  	qcom_q6v5_unprepare(&wcss->q6v5);
  
-@@ -764,9 +790,15 @@ static int q6v5_wcss_load(struct rproc *rproc, const struct firmware *fw)
+@@ -764,9 +790,15 @@ static int q6v5_wcss_load(struct rproc *
  	struct q6v5_wcss *wcss = rproc->priv;
  	int ret;
  
@@ -117,7 +115,7 @@ index 0e5484020296..7d173b7816b8 100644
  	if (ret)
  		return ret;
  
-@@ -1032,6 +1064,9 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
+@@ -1032,6 +1064,9 @@ static int q6v5_wcss_probe(struct platfo
  	if (!desc)
  		return -EINVAL;
  
@@ -127,7 +125,7 @@ index 0e5484020296..7d173b7816b8 100644
  	rproc = rproc_alloc(&pdev->dev, pdev->name, desc->ops,
  			    desc->firmware_name, sizeof(*wcss));
  	if (!rproc) {
-@@ -1045,6 +1080,7 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
+@@ -1045,6 +1080,7 @@ static int q6v5_wcss_probe(struct platfo
  
  	wcss->version = desc->version;
  	wcss->requires_force_stop = desc->requires_force_stop;
@@ -135,7 +133,7 @@ index 0e5484020296..7d173b7816b8 100644
  
  	ret = q6v5_wcss_init_mmio(wcss, pdev);
  	if (ret)
-@@ -1115,6 +1151,7 @@ static const struct wcss_data wcss_ipq8074_res_init = {
+@@ -1115,6 +1151,7 @@ static const struct wcss_data wcss_ipq80
  	.wcss_q6_reset_required = true,
  	.ops = &q6v5_wcss_ipq8074_ops,
  	.requires_force_stop = true,
@@ -143,6 +141,3 @@ index 0e5484020296..7d173b7816b8 100644
  };
  
  static const struct wcss_data wcss_qcs404_res_init = {
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0115-remoteproc-qcom-Add-support-for-split-q6-m3-wlan-fir.patch b/target/linux/ipq60xx/patches-5.15/0115-remoteproc-qcom-Add-support-for-split-q6-m3-wlan-fir.patch
index 20e7295b7..86b9c514f 100644
--- a/target/linux/ipq60xx/patches-5.15/0115-remoteproc-qcom-Add-support-for-split-q6-m3-wlan-fir.patch
+++ b/target/linux/ipq60xx/patches-5.15/0115-remoteproc-qcom-Add-support-for-split-q6-m3-wlan-fir.patch
@@ -16,8 +16,6 @@ Signed-off-by: Nikhil Prakash V <nprakash@codeaurora.org>
  drivers/remoteproc/qcom_q6v5_wcss.c | 33 +++++++++++++++++++++++++----
  1 file changed, 29 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
-index 7d173b7816b8..60ed0c046693 100644
 --- a/drivers/remoteproc/qcom_q6v5_wcss.c
 +++ b/drivers/remoteproc/qcom_q6v5_wcss.c
 @@ -139,6 +139,7 @@ struct q6v5_wcss {
@@ -38,7 +36,7 @@ index 7d173b7816b8..60ed0c046693 100644
  	unsigned int crash_reason_smem;
  	u32 version;
  	bool aon_reset_required;
-@@ -788,8 +790,29 @@ static void *q6v5_wcss_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *i
+@@ -788,8 +790,29 @@ static void *q6v5_wcss_da_to_va(struct r
  static int q6v5_wcss_load(struct rproc *rproc, const struct firmware *fw)
  {
  	struct q6v5_wcss *wcss = rproc->priv;
@@ -68,7 +66,7 @@ index 7d173b7816b8..60ed0c046693 100644
  	if (wcss->need_mem_protection)
  		ret = qcom_mdt_load(wcss->dev, fw, rproc->firmware,
  				    WCNSS_PAS_ID, wcss->mem_region,
-@@ -1068,7 +1091,7 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
+@@ -1068,7 +1091,7 @@ static int q6v5_wcss_probe(struct platfo
  		return -EPROBE_DEFER;
  
  	rproc = rproc_alloc(&pdev->dev, pdev->name, desc->ops,
@@ -77,7 +75,7 @@ index 7d173b7816b8..60ed0c046693 100644
  	if (!rproc) {
  		dev_err(&pdev->dev, "failed to allocate rproc\n");
  		return -ENOMEM;
-@@ -1081,6 +1104,7 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
+@@ -1081,6 +1104,7 @@ static int q6v5_wcss_probe(struct platfo
  	wcss->version = desc->version;
  	wcss->requires_force_stop = desc->requires_force_stop;
  	wcss->need_mem_protection = desc->need_mem_protection;
@@ -85,7 +83,7 @@ index 7d173b7816b8..60ed0c046693 100644
  
  	ret = q6v5_wcss_init_mmio(wcss, pdev);
  	if (ret)
-@@ -1145,7 +1169,8 @@ static int q6v5_wcss_remove(struct platform_device *pdev)
+@@ -1145,7 +1169,8 @@ static int q6v5_wcss_remove(struct platf
  
  static const struct wcss_data wcss_ipq8074_res_init = {
  	.init_clock = ipq8074_init_clock,
@@ -95,7 +93,7 @@ index 7d173b7816b8..60ed0c046693 100644
  	.crash_reason_smem = WCSS_CRASH_REASON,
  	.aon_reset_required = true,
  	.wcss_q6_reset_required = true,
-@@ -1158,7 +1183,7 @@ static const struct wcss_data wcss_qcs404_res_init = {
+@@ -1158,7 +1183,7 @@ static const struct wcss_data wcss_qcs40
  	.init_clock = qcs404_init_clock,
  	.init_regulator = qcs404_init_regulator,
  	.crash_reason_smem = WCSS_CRASH_REASON,
@@ -104,6 +102,3 @@ index 7d173b7816b8..60ed0c046693 100644
  	.version = WCSS_QCS404,
  	.aon_reset_required = false,
  	.wcss_q6_reset_required = false,
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0116-remoteproc-qcom-Add-ssr-subdevice-identifier.patch b/target/linux/ipq60xx/patches-5.15/0116-remoteproc-qcom-Add-ssr-subdevice-identifier.patch
index 05c29d6bd..53bafa82b 100644
--- a/target/linux/ipq60xx/patches-5.15/0116-remoteproc-qcom-Add-ssr-subdevice-identifier.patch
+++ b/target/linux/ipq60xx/patches-5.15/0116-remoteproc-qcom-Add-ssr-subdevice-identifier.patch
@@ -12,11 +12,9 @@ Signed-off-by: Nikhil Prakash V <nprakash@codeaurora.org>
  drivers/remoteproc/qcom_q6v5_wcss.c | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
-index 60ed0c046693..e32efdc660d2 100644
 --- a/drivers/remoteproc/qcom_q6v5_wcss.c
 +++ b/drivers/remoteproc/qcom_q6v5_wcss.c
-@@ -1174,6 +1174,7 @@ static const struct wcss_data wcss_ipq8074_res_init = {
+@@ -1174,6 +1174,7 @@ static const struct wcss_data wcss_ipq80
  	.crash_reason_smem = WCSS_CRASH_REASON,
  	.aon_reset_required = true,
  	.wcss_q6_reset_required = true,
@@ -24,6 +22,3 @@ index 60ed0c046693..e32efdc660d2 100644
  	.ops = &q6v5_wcss_ipq8074_ops,
  	.requires_force_stop = true,
  	.need_mem_protection = true,
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0117-remoteproc-qcom-Update-regmap-offsets-for-halt-regis.patch b/target/linux/ipq60xx/patches-5.15/0117-remoteproc-qcom-Update-regmap-offsets-for-halt-regis.patch
index c91e3817a..243cfe7e0 100644
--- a/target/linux/ipq60xx/patches-5.15/0117-remoteproc-qcom-Update-regmap-offsets-for-halt-regis.patch
+++ b/target/linux/ipq60xx/patches-5.15/0117-remoteproc-qcom-Update-regmap-offsets-for-halt-regis.patch
@@ -12,8 +12,6 @@ Signed-off-by: Sricharan R <sricharan@codeaurora.org>
  drivers/remoteproc/qcom_q6v5_wcss.c | 22 ++++++++++++++--------
  1 file changed, 14 insertions(+), 8 deletions(-)
 
-diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
-index e32efdc660d2..16fc5a33adaf 100644
 --- a/drivers/remoteproc/qcom_q6v5_wcss.c
 +++ b/drivers/remoteproc/qcom_q6v5_wcss.c
 @@ -86,7 +86,7 @@
@@ -33,7 +31,7 @@ index e32efdc660d2..16fc5a33adaf 100644
  	const char *ssr_name;
  	const char *sysmon_name;
  	int ssctl_id;
-@@ -874,10 +875,13 @@ static int q6v5_wcss_init_reset(struct q6v5_wcss *wcss,
+@@ -874,10 +875,13 @@ static int q6v5_wcss_init_reset(struct q
  		}
  	}
  
@@ -51,7 +49,7 @@ index e32efdc660d2..16fc5a33adaf 100644
  	}
  
  	return 0;
-@@ -925,9 +929,9 @@ static int q6v5_wcss_init_mmio(struct q6v5_wcss *wcss,
+@@ -925,9 +929,9 @@ static int q6v5_wcss_init_mmio(struct q6
  		return -EINVAL;
  	}
  
@@ -64,7 +62,7 @@ index e32efdc660d2..16fc5a33adaf 100644
  
  	return 0;
  }
-@@ -1174,6 +1178,7 @@ static const struct wcss_data wcss_ipq8074_res_init = {
+@@ -1174,6 +1178,7 @@ static const struct wcss_data wcss_ipq80
  	.crash_reason_smem = WCSS_CRASH_REASON,
  	.aon_reset_required = true,
  	.wcss_q6_reset_required = true,
@@ -72,7 +70,7 @@ index e32efdc660d2..16fc5a33adaf 100644
  	.ssr_name = "q6wcss",
  	.ops = &q6v5_wcss_ipq8074_ops,
  	.requires_force_stop = true,
-@@ -1188,6 +1193,7 @@ static const struct wcss_data wcss_qcs404_res_init = {
+@@ -1188,6 +1193,7 @@ static const struct wcss_data wcss_qcs40
  	.version = WCSS_QCS404,
  	.aon_reset_required = false,
  	.wcss_q6_reset_required = false,
@@ -80,6 +78,3 @@ index e32efdc660d2..16fc5a33adaf 100644
  	.ssr_name = "mpss",
  	.sysmon_name = "wcnss",
  	.ssctl_id = 0x12,
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0118-drivers-thermal-tsens-Add-support-for-combined-inter.patch b/target/linux/ipq60xx/patches-5.15/0118-drivers-thermal-tsens-Add-support-for-combined-inter.patch
index 5b8c5e86a..5260c528e 100644
--- a/target/linux/ipq60xx/patches-5.15/0118-drivers-thermal-tsens-Add-support-for-combined-inter.patch
+++ b/target/linux/ipq60xx/patches-5.15/0118-drivers-thermal-tsens-Add-support-for-combined-inter.patch
@@ -23,11 +23,9 @@ Changes in v6:
  drivers/thermal/qcom/tsens.h      |  2 ++
  6 files changed, 38 insertions(+), 6 deletions(-)
 
-diff --git a/drivers/thermal/qcom/tsens-8960.c b/drivers/thermal/qcom/tsens-8960.c
-index 67c1748cdf73..ee584e5b07e5 100644
 --- a/drivers/thermal/qcom/tsens-8960.c
 +++ b/drivers/thermal/qcom/tsens-8960.c
-@@ -269,6 +269,7 @@ static const struct tsens_ops ops_8960 = {
+@@ -269,6 +269,7 @@ static const struct tsens_ops ops_8960 =
  static struct tsens_features tsens_8960_feat = {
  	.ver_major	= VER_0,
  	.crit_int	= 0,
@@ -35,11 +33,9 @@ index 67c1748cdf73..ee584e5b07e5 100644
  	.adc		= 1,
  	.srot_split	= 0,
  	.max_sensors	= 11,
-diff --git a/drivers/thermal/qcom/tsens-v0_1.c b/drivers/thermal/qcom/tsens-v0_1.c
-index f136cb350238..6effb822bf3c 100644
 --- a/drivers/thermal/qcom/tsens-v0_1.c
 +++ b/drivers/thermal/qcom/tsens-v0_1.c
-@@ -539,6 +539,7 @@ static int calibrate_9607(struct tsens_priv *priv)
+@@ -539,6 +539,7 @@ static int calibrate_9607(struct tsens_p
  static struct tsens_features tsens_v0_1_feat = {
  	.ver_major	= VER_0_1,
  	.crit_int	= 0,
@@ -47,11 +43,9 @@ index f136cb350238..6effb822bf3c 100644
  	.adc		= 1,
  	.srot_split	= 1,
  	.max_sensors	= 11,
-diff --git a/drivers/thermal/qcom/tsens-v1.c b/drivers/thermal/qcom/tsens-v1.c
-index 573e261ccca7..a4f561a6e582 100644
 --- a/drivers/thermal/qcom/tsens-v1.c
 +++ b/drivers/thermal/qcom/tsens-v1.c
-@@ -302,6 +302,7 @@ static int calibrate_8976(struct tsens_priv *priv)
+@@ -302,6 +302,7 @@ static int calibrate_8976(struct tsens_p
  static struct tsens_features tsens_v1_feat = {
  	.ver_major	= VER_1_X,
  	.crit_int	= 0,
@@ -59,8 +53,6 @@ index 573e261ccca7..a4f561a6e582 100644
  	.adc		= 1,
  	.srot_split	= 1,
  	.max_sensors	= 11,
-diff --git a/drivers/thermal/qcom/tsens-v2.c b/drivers/thermal/qcom/tsens-v2.c
-index b293ed32174b..129cdb247381 100644
 --- a/drivers/thermal/qcom/tsens-v2.c
 +++ b/drivers/thermal/qcom/tsens-v2.c
 @@ -31,6 +31,7 @@
@@ -71,11 +63,9 @@ index b293ed32174b..129cdb247381 100644
  	.adc		= 0,
  	.srot_split	= 1,
  	.max_sensors	= 16,
-diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
-index 99a8d9f3e03c..11172afbc5da 100644
 --- a/drivers/thermal/qcom/tsens.c
 +++ b/drivers/thermal/qcom/tsens.c
-@@ -531,6 +531,27 @@ static irqreturn_t tsens_irq_thread(int irq, void *data)
+@@ -531,6 +531,27 @@ static irqreturn_t tsens_irq_thread(int
  	return IRQ_HANDLED;
  }
  
@@ -103,7 +93,7 @@ index 99a8d9f3e03c..11172afbc5da 100644
  static int tsens_set_trips(void *_sensor, int low, int high)
  {
  	struct tsens_sensor *s = _sensor;
-@@ -1075,13 +1096,18 @@ static int tsens_register(struct tsens_priv *priv)
+@@ -1075,13 +1096,18 @@ static int tsens_register(struct tsens_p
  				   tsens_mC_to_hw(priv->sensor, 0));
  	}
  
@@ -128,8 +118,6 @@ index 99a8d9f3e03c..11172afbc5da 100644
  
  	return ret;
  }
-diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
-index 1471a2c00f15..4614177944d6 100644
 --- a/drivers/thermal/qcom/tsens.h
 +++ b/drivers/thermal/qcom/tsens.h
 @@ -495,6 +495,7 @@ enum regfield_ids {
@@ -148,6 +136,3 @@ index 1471a2c00f15..4614177944d6 100644
  	unsigned int adc:1;
  	unsigned int srot_split:1;
  	unsigned int has_watchdog:1;
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0119-drivers-thermal-tsens-allow-configuring-min-and-max-.patch b/target/linux/ipq60xx/patches-5.15/0119-drivers-thermal-tsens-allow-configuring-min-and-max-.patch
index 602a713ca..36219c30c 100644
--- a/target/linux/ipq60xx/patches-5.15/0119-drivers-thermal-tsens-allow-configuring-min-and-max-.patch
+++ b/target/linux/ipq60xx/patches-5.15/0119-drivers-thermal-tsens-allow-configuring-min-and-max-.patch
@@ -21,11 +21,9 @@ Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
  drivers/thermal/qcom/tsens.h      | 4 ++++
  6 files changed, 14 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/thermal/qcom/tsens-8960.c b/drivers/thermal/qcom/tsens-8960.c
-index ee584e5b07e5..4585904fb380 100644
 --- a/drivers/thermal/qcom/tsens-8960.c
 +++ b/drivers/thermal/qcom/tsens-8960.c
-@@ -273,6 +273,8 @@ static struct tsens_features tsens_8960_feat = {
+@@ -273,6 +273,8 @@ static struct tsens_features tsens_8960_
  	.adc		= 1,
  	.srot_split	= 0,
  	.max_sensors	= 11,
@@ -34,11 +32,9 @@ index ee584e5b07e5..4585904fb380 100644
  };
  
  struct tsens_plat_data data_8960 = {
-diff --git a/drivers/thermal/qcom/tsens-v0_1.c b/drivers/thermal/qcom/tsens-v0_1.c
-index 6effb822bf3c..2c203ff374e6 100644
 --- a/drivers/thermal/qcom/tsens-v0_1.c
 +++ b/drivers/thermal/qcom/tsens-v0_1.c
-@@ -543,6 +543,8 @@ static struct tsens_features tsens_v0_1_feat = {
+@@ -543,6 +543,8 @@ static struct tsens_features tsens_v0_1_
  	.adc		= 1,
  	.srot_split	= 1,
  	.max_sensors	= 11,
@@ -47,11 +43,9 @@ index 6effb822bf3c..2c203ff374e6 100644
  };
  
  static const struct reg_field tsens_v0_1_regfields[MAX_REGFIELDS] = {
-diff --git a/drivers/thermal/qcom/tsens-v1.c b/drivers/thermal/qcom/tsens-v1.c
-index a4f561a6e582..1d7f8a80bd13 100644
 --- a/drivers/thermal/qcom/tsens-v1.c
 +++ b/drivers/thermal/qcom/tsens-v1.c
-@@ -306,6 +306,8 @@ static struct tsens_features tsens_v1_feat = {
+@@ -306,6 +306,8 @@ static struct tsens_features tsens_v1_fe
  	.adc		= 1,
  	.srot_split	= 1,
  	.max_sensors	= 11,
@@ -60,11 +54,9 @@ index a4f561a6e582..1d7f8a80bd13 100644
  };
  
  static const struct reg_field tsens_v1_regfields[MAX_REGFIELDS] = {
-diff --git a/drivers/thermal/qcom/tsens-v2.c b/drivers/thermal/qcom/tsens-v2.c
-index 129cdb247381..9babc69bfd22 100644
 --- a/drivers/thermal/qcom/tsens-v2.c
 +++ b/drivers/thermal/qcom/tsens-v2.c
-@@ -35,6 +35,8 @@ static struct tsens_features tsens_v2_feat = {
+@@ -35,6 +35,8 @@ static struct tsens_features tsens_v2_fe
  	.adc		= 0,
  	.srot_split	= 1,
  	.max_sensors	= 16,
@@ -73,11 +65,9 @@ index 129cdb247381..9babc69bfd22 100644
  };
  
  static const struct reg_field tsens_v2_regfields[MAX_REGFIELDS] = {
-diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
-index 11172afbc5da..e11861581970 100644
 --- a/drivers/thermal/qcom/tsens.c
 +++ b/drivers/thermal/qcom/tsens.c
-@@ -572,8 +572,8 @@ static int tsens_set_trips(void *_sensor, int low, int high)
+@@ -572,8 +572,8 @@ static int tsens_set_trips(void *_sensor
  	dev_dbg(dev, "[%u] %s: proposed thresholds: (%d:%d)\n",
  		hw_id, __func__, low, high);
  
@@ -88,8 +78,6 @@ index 11172afbc5da..e11861581970 100644
  
  	high_val = tsens_mC_to_hw(s, cl_high);
  	low_val  = tsens_mC_to_hw(s, cl_low);
-diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
-index 4614177944d6..747004476347 100644
 --- a/drivers/thermal/qcom/tsens.h
 +++ b/drivers/thermal/qcom/tsens.h
 @@ -501,6 +501,8 @@ enum regfield_ids {
@@ -110,6 +98,3 @@ index 4614177944d6..747004476347 100644
  };
  
  /**
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0120-drivers-thermal-tsens-add-IPQ8074-support.patch b/target/linux/ipq60xx/patches-5.15/0120-drivers-thermal-tsens-add-IPQ8074-support.patch
index 2ecf2e00e..88a3f56f9 100644
--- a/target/linux/ipq60xx/patches-5.15/0120-drivers-thermal-tsens-add-IPQ8074-support.patch
+++ b/target/linux/ipq60xx/patches-5.15/0120-drivers-thermal-tsens-add-IPQ8074-support.patch
@@ -15,11 +15,9 @@ Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
  drivers/thermal/qcom/tsens.h    |  2 +-
  3 files changed, 21 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/thermal/qcom/tsens-v2.c b/drivers/thermal/qcom/tsens-v2.c
-index 9babc69bfd22..29a61d2d6ca3 100644
 --- a/drivers/thermal/qcom/tsens-v2.c
 +++ b/drivers/thermal/qcom/tsens-v2.c
-@@ -39,6 +39,17 @@ static struct tsens_features tsens_v2_feat = {
+@@ -39,6 +39,17 @@ static struct tsens_features tsens_v2_fe
  	.trip_max_temp	= 120000,
  };
  
@@ -50,25 +48,21 @@ index 9babc69bfd22..29a61d2d6ca3 100644
  /* Kept around for backward compatibility with old msm8996.dtsi */
  struct tsens_plat_data data_8996 = {
  	.num_sensors	= 13,
-diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
-index e11861581970..60b65bd2e7a3 100644
 --- a/drivers/thermal/qcom/tsens.c
 +++ b/drivers/thermal/qcom/tsens.c
-@@ -990,6 +990,9 @@ static const struct of_device_id tsens_table[] = {
- 	{
+@@ -991,6 +991,9 @@ static const struct of_device_id tsens_t
  		.compatible = "qcom,ipq8064-tsens",
  		.data = &data_8960,
-+	}, {
+ 	}, {
 +		.compatible = "qcom,ipq8074-tsens",
 +		.data = &data_ipq8074,
- 	}, {
++	}, {
  		.compatible = "qcom,mdm9607-tsens",
  		.data = &data_9607,
-diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
-index 747004476347..8dd990d944ad 100644
+ 	}, {
 --- a/drivers/thermal/qcom/tsens.h
 +++ b/drivers/thermal/qcom/tsens.h
-@@ -599,6 +599,6 @@ extern struct tsens_plat_data data_8916, data_8939, data_8974, data_9607;
+@@ -599,6 +599,6 @@ extern struct tsens_plat_data data_8916,
  extern struct tsens_plat_data data_tsens_v1, data_8976;
  
  /* TSENS v2 targets */
@@ -76,6 +70,3 @@ index 747004476347..8dd990d944ad 100644
 +extern struct tsens_plat_data data_8996, data_ipq8074, data_tsens_v2;
  
  #endif /* __QCOM_TSENS_H__ */
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0121-arm64-dts-ipq8074-add-thermal-nodes.patch b/target/linux/ipq60xx/patches-5.15/0121-arm64-dts-ipq8074-add-thermal-nodes.patch
index 10d90cd79..206a85ffa 100644
--- a/target/linux/ipq60xx/patches-5.15/0121-arm64-dts-ipq8074-add-thermal-nodes.patch
+++ b/target/linux/ipq60xx/patches-5.15/0121-arm64-dts-ipq8074-add-thermal-nodes.patch
@@ -19,11 +19,9 @@ Changes in v5:
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 96 +++++++++++++++++++++++++++
  1 file changed, 96 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 019c8e302273..9707136f08e1 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -310,6 +310,16 @@ prng: rng@e3000 {
+@@ -310,6 +310,16 @@
  			status = "disabled";
  		};
  
@@ -40,7 +38,7 @@ index 019c8e302273..9707136f08e1 100644
  		cryptobam: dma-controller@704000 {
  			compatible = "qcom,bam-v1.7.0";
  			reg = <0x00704000 0x20000>;
-@@ -920,4 +930,90 @@ timer {
+@@ -920,4 +930,90 @@
  			     <GIC_PPI 4 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
  			     <GIC_PPI 1 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
  	};
@@ -131,6 +129,3 @@ index 019c8e302273..9707136f08e1 100644
 +		};
 +	};
  };
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0122-mfd-qcom-spmi-pmic-add-support-for-PMP8074.patch b/target/linux/ipq60xx/patches-5.15/0122-mfd-qcom-spmi-pmic-add-support-for-PMP8074.patch
index f2e64bd97..07a31af89 100644
--- a/target/linux/ipq60xx/patches-5.15/0122-mfd-qcom-spmi-pmic-add-support-for-PMP8074.patch
+++ b/target/linux/ipq60xx/patches-5.15/0122-mfd-qcom-spmi-pmic-add-support-for-PMP8074.patch
@@ -13,11 +13,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  drivers/mfd/qcom-spmi-pmic.c | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/drivers/mfd/qcom-spmi-pmic.c b/drivers/mfd/qcom-spmi-pmic.c
-index 1cacc00aa6c9..664de43df690 100644
 --- a/drivers/mfd/qcom-spmi-pmic.c
 +++ b/drivers/mfd/qcom-spmi-pmic.c
-@@ -76,6 +76,7 @@ static const struct of_device_id pmic_spmi_id_table[] = {
+@@ -76,6 +76,7 @@ static const struct of_device_id pmic_sp
  	{ .compatible = "qcom,pmi8994",   .data = (void *)PMI8994_SUBTYPE },
  	{ .compatible = "qcom,pmi8998",   .data = (void *)PMI8998_SUBTYPE },
  	{ .compatible = "qcom,pmk8002",   .data = (void *)PMK8002_SUBTYPE },
@@ -25,6 +23,3 @@ index 1cacc00aa6c9..664de43df690 100644
  	{ .compatible = "qcom,smb2351",   .data = (void *)SMB2351_SUBTYPE },
  	{ .compatible = "qcom,spmi-pmic", .data = (void *)COMMON_SUBTYPE },
  	{ }
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0123-arm64-dts-qcom-add-PMP8074-DTSI.patch b/target/linux/ipq60xx/patches-5.15/0123-arm64-dts-qcom-add-PMP8074-DTSI.patch
index 57f911248..8c2c68616 100644
--- a/target/linux/ipq60xx/patches-5.15/0123-arm64-dts-qcom-add-PMP8074-DTSI.patch
+++ b/target/linux/ipq60xx/patches-5.15/0123-arm64-dts-qcom-add-PMP8074-DTSI.patch
@@ -28,9 +28,6 @@ regulator subnodes
  1 file changed, 125 insertions(+)
  create mode 100644 arch/arm64/boot/dts/qcom/pmp8074.dtsi
 
-diff --git a/arch/arm64/boot/dts/qcom/pmp8074.dtsi b/arch/arm64/boot/dts/qcom/pmp8074.dtsi
-new file mode 100644
-index 000000000000..ceb2e6358b3d
 --- /dev/null
 +++ b/arch/arm64/boot/dts/qcom/pmp8074.dtsi
 @@ -0,0 +1,125 @@
@@ -159,6 +156,3 @@ index 000000000000..ceb2e6358b3d
 +		};
 +	};
 +};
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0124-arm64-dts-qcom-ipq8074-hk01-add-VQMMC-supply.patch b/target/linux/ipq60xx/patches-5.15/0124-arm64-dts-qcom-ipq8074-hk01-add-VQMMC-supply.patch
index 0a52509a8..0d1aea992 100644
--- a/target/linux/ipq60xx/patches-5.15/0124-arm64-dts-qcom-ipq8074-hk01-add-VQMMC-supply.patch
+++ b/target/linux/ipq60xx/patches-5.15/0124-arm64-dts-qcom-ipq8074-hk01-add-VQMMC-supply.patch
@@ -15,8 +15,6 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  arch/arm64/boot/dts/qcom/ipq8074-hk01.dts | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts b/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts
-index ef30053136e3..f2b2691cc463 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts
 +++ b/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts
 @@ -3,6 +3,7 @@
@@ -27,7 +25,7 @@ index ef30053136e3..f2b2691cc463 100644
  
  / {
  	model = "Qualcomm Technologies, Inc. IPQ8074-HK01";
-@@ -82,6 +83,7 @@ nand@0 {
+@@ -82,6 +83,7 @@
  
  &sdhc_1 {
  	status = "okay";
@@ -35,6 +33,3 @@ index ef30053136e3..f2b2691cc463 100644
  };
  
  &qusb_phy_0 {
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0125-arm64-dts-ipq8074-add-CPU-clock.patch b/target/linux/ipq60xx/patches-5.15/0125-arm64-dts-ipq8074-add-CPU-clock.patch
index c017de2f8..29d0b3890 100644
--- a/target/linux/ipq60xx/patches-5.15/0125-arm64-dts-ipq8074-add-CPU-clock.patch
+++ b/target/linux/ipq60xx/patches-5.15/0125-arm64-dts-ipq8074-add-CPU-clock.patch
@@ -11,8 +11,6 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 9 +++++++++
  1 file changed, 9 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 9707136f08e1..b9030cb8fbf3 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 @@ -5,6 +5,7 @@
@@ -23,7 +21,7 @@ index 9707136f08e1..b9030cb8fbf3 100644
  
  / {
  	#address-cells = <2>;
-@@ -38,6 +39,8 @@ CPU0: cpu@0 {
+@@ -38,6 +39,8 @@
  			reg = <0x0>;
  			next-level-cache = <&L2_0>;
  			enable-method = "psci";
@@ -32,7 +30,7 @@ index 9707136f08e1..b9030cb8fbf3 100644
  		};
  
  		CPU1: cpu@1 {
-@@ -46,6 +49,8 @@ CPU1: cpu@1 {
+@@ -46,6 +49,8 @@
  			enable-method = "psci";
  			reg = <0x1>;
  			next-level-cache = <&L2_0>;
@@ -41,7 +39,7 @@ index 9707136f08e1..b9030cb8fbf3 100644
  		};
  
  		CPU2: cpu@2 {
-@@ -54,6 +59,8 @@ CPU2: cpu@2 {
+@@ -54,6 +59,8 @@
  			enable-method = "psci";
  			reg = <0x2>;
  			next-level-cache = <&L2_0>;
@@ -50,7 +48,7 @@ index 9707136f08e1..b9030cb8fbf3 100644
  		};
  
  		CPU3: cpu@3 {
-@@ -62,6 +69,8 @@ CPU3: cpu@3 {
+@@ -62,6 +69,8 @@
  			enable-method = "psci";
  			reg = <0x3>;
  			next-level-cache = <&L2_0>;
@@ -59,6 +57,3 @@ index 9707136f08e1..b9030cb8fbf3 100644
  		};
  
  		L2_0: l2-cache {
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0126-arm64-dts-ipq8074-add-label-to-cpus.patch b/target/linux/ipq60xx/patches-5.15/0126-arm64-dts-ipq8074-add-label-to-cpus.patch
index 684366f88..45a560ee0 100644
--- a/target/linux/ipq60xx/patches-5.15/0126-arm64-dts-ipq8074-add-label-to-cpus.patch
+++ b/target/linux/ipq60xx/patches-5.15/0126-arm64-dts-ipq8074-add-label-to-cpus.patch
@@ -12,11 +12,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  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 b9030cb8fbf3..bcf2163f527f 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -29,7 +29,7 @@ xo: xo {
+@@ -29,7 +29,7 @@
  		};
  	};
  
@@ -25,6 +23,3 @@ index b9030cb8fbf3..bcf2163f527f 100644
  		#address-cells = <0x1>;
  		#size-cells = <0x0>;
  
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0127-arm64-dts-ipq8074-add-cooling-cells-to-CPU-nodes.patch b/target/linux/ipq60xx/patches-5.15/0127-arm64-dts-ipq8074-add-cooling-cells-to-CPU-nodes.patch
index 08a56a6f1..b49e1b8df 100644
--- a/target/linux/ipq60xx/patches-5.15/0127-arm64-dts-ipq8074-add-cooling-cells-to-CPU-nodes.patch
+++ b/target/linux/ipq60xx/patches-5.15/0127-arm64-dts-ipq8074-add-cooling-cells-to-CPU-nodes.patch
@@ -12,11 +12,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index bcf2163f527f..8094bef3f28f 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -41,6 +41,7 @@ CPU0: cpu@0 {
+@@ -41,6 +41,7 @@
  			enable-method = "psci";
  			clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
  			clock-names = "cpu";
@@ -24,7 +22,7 @@ index bcf2163f527f..8094bef3f28f 100644
  		};
  
  		CPU1: cpu@1 {
-@@ -51,6 +52,7 @@ CPU1: cpu@1 {
+@@ -51,6 +52,7 @@
  			next-level-cache = <&L2_0>;
  			clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
  			clock-names = "cpu";
@@ -32,7 +30,7 @@ index bcf2163f527f..8094bef3f28f 100644
  		};
  
  		CPU2: cpu@2 {
-@@ -61,6 +63,7 @@ CPU2: cpu@2 {
+@@ -61,6 +63,7 @@
  			next-level-cache = <&L2_0>;
  			clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
  			clock-names = "cpu";
@@ -40,7 +38,7 @@ index bcf2163f527f..8094bef3f28f 100644
  		};
  
  		CPU3: cpu@3 {
-@@ -71,6 +74,7 @@ CPU3: cpu@3 {
+@@ -71,6 +74,7 @@
  			next-level-cache = <&L2_0>;
  			clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
  			clock-names = "cpu";
@@ -48,6 +46,3 @@ index bcf2163f527f..8094bef3f28f 100644
  		};
  
  		L2_0: l2-cache {
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0128-dt-bindings-clock-qcom-Add-reset-for-WCSSAON.patch b/target/linux/ipq60xx/patches-5.15/0128-dt-bindings-clock-qcom-Add-reset-for-WCSSAON.patch
index 243f8f37e..b91b7565d 100644
--- a/target/linux/ipq60xx/patches-5.15/0128-dt-bindings-clock-qcom-Add-reset-for-WCSSAON.patch
+++ b/target/linux/ipq60xx/patches-5.15/0128-dt-bindings-clock-qcom-Add-reset-for-WCSSAON.patch
@@ -14,8 +14,6 @@ Acked-by: Stephen Boyd <sboyd@kernel.org>
  include/dt-bindings/clock/qcom,gcc-ipq8074.h | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/include/dt-bindings/clock/qcom,gcc-ipq8074.h b/include/dt-bindings/clock/qcom,gcc-ipq8074.h
-index e4991d303708..7b425cede707 100644
 --- a/include/dt-bindings/clock/qcom,gcc-ipq8074.h
 +++ b/include/dt-bindings/clock/qcom,gcc-ipq8074.h
 @@ -367,6 +367,7 @@
@@ -26,6 +24,3 @@ index e4991d303708..7b425cede707 100644
  
  #define USB0_GDSC				0
  #define USB1_GDSC				1
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0129-clk-qcom-Add-WCSSAON-reset.patch b/target/linux/ipq60xx/patches-5.15/0129-clk-qcom-Add-WCSSAON-reset.patch
index 3493a8ceb..c90eb7bef 100644
--- a/target/linux/ipq60xx/patches-5.15/0129-clk-qcom-Add-WCSSAON-reset.patch
+++ b/target/linux/ipq60xx/patches-5.15/0129-clk-qcom-Add-WCSSAON-reset.patch
@@ -13,11 +13,9 @@ Acked-by: Stephen Boyd <sboyd@kernel.org>
  drivers/clk/qcom/gcc-ipq8074.c | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/drivers/clk/qcom/gcc-ipq8074.c b/drivers/clk/qcom/gcc-ipq8074.c
-index 42d185fe19c8..7954a730aad2 100644
 --- a/drivers/clk/qcom/gcc-ipq8074.c
 +++ b/drivers/clk/qcom/gcc-ipq8074.c
-@@ -4826,6 +4826,7 @@ static const struct qcom_reset_map gcc_ipq8074_resets[] = {
+@@ -4826,6 +4826,7 @@ static const struct qcom_reset_map gcc_i
  	[GCC_PCIE1_AXI_SLAVE_ARES] = { 0x76040, 4 },
  	[GCC_PCIE1_AHB_ARES] = { 0x76040, 5 },
  	[GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 },
@@ -25,6 +23,3 @@ index 42d185fe19c8..7954a730aad2 100644
  };
  
  static struct gdsc *gcc_ipq8074_gdscs[] = {
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0130-remoteproc-wcss-disable-auto-boot-for-IPQ8074.patch b/target/linux/ipq60xx/patches-5.15/0130-remoteproc-wcss-disable-auto-boot-for-IPQ8074.patch
index 38cfecfcf..869ed45a0 100644
--- a/target/linux/ipq60xx/patches-5.15/0130-remoteproc-wcss-disable-auto-boot-for-IPQ8074.patch
+++ b/target/linux/ipq60xx/patches-5.15/0130-remoteproc-wcss-disable-auto-boot-for-IPQ8074.patch
@@ -11,8 +11,6 @@ Change-Id: Ia82edb7ee52f2bd010c099f151179d69a953ac88
  drivers/remoteproc/qcom_q6v5_wcss.c | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
-index 16fc5a33adaf..92c240976f55 100644
 --- a/drivers/remoteproc/qcom_q6v5_wcss.c
 +++ b/drivers/remoteproc/qcom_q6v5_wcss.c
 @@ -161,6 +161,7 @@ struct wcss_data {
@@ -23,7 +21,7 @@ index 16fc5a33adaf..92c240976f55 100644
  };
  
  static int q6v5_wcss_reset(struct q6v5_wcss *wcss)
-@@ -1147,6 +1148,7 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
+@@ -1147,6 +1148,7 @@ static int q6v5_wcss_probe(struct platfo
  						      desc->sysmon_name,
  						      desc->ssctl_id);
  
@@ -31,7 +29,7 @@ index 16fc5a33adaf..92c240976f55 100644
  	ret = rproc_add(rproc);
  	if (ret)
  		goto free_rproc;
-@@ -1183,6 +1185,7 @@ static const struct wcss_data wcss_ipq8074_res_init = {
+@@ -1183,6 +1185,7 @@ static const struct wcss_data wcss_ipq80
  	.ops = &q6v5_wcss_ipq8074_ops,
  	.requires_force_stop = true,
  	.need_mem_protection = true,
@@ -39,7 +37,7 @@ index 16fc5a33adaf..92c240976f55 100644
  };
  
  static const struct wcss_data wcss_qcs404_res_init = {
-@@ -1199,6 +1202,7 @@ static const struct wcss_data wcss_qcs404_res_init = {
+@@ -1199,6 +1202,7 @@ static const struct wcss_data wcss_qcs40
  	.ssctl_id = 0x12,
  	.ops = &q6v5_wcss_qcs404_ops,
  	.requires_force_stop = false,
@@ -47,6 +45,3 @@ index 16fc5a33adaf..92c240976f55 100644
  };
  
  static const struct of_device_id q6v5_wcss_of_match[] = {
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0131-arm64-dts-qcom-Enable-Q6v5-WCSS-for-ipq8074-SoC.patch b/target/linux/ipq60xx/patches-5.15/0131-arm64-dts-qcom-Enable-Q6v5-WCSS-for-ipq8074-SoC.patch
index 586c33158..3a3a9e73a 100644
--- a/target/linux/ipq60xx/patches-5.15/0131-arm64-dts-qcom-Enable-Q6v5-WCSS-for-ipq8074-SoC.patch
+++ b/target/linux/ipq60xx/patches-5.15/0131-arm64-dts-qcom-Enable-Q6v5-WCSS-for-ipq8074-SoC.patch
@@ -14,11 +14,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 81 +++++++++++++++++++++++++++
  1 file changed, 81 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 8094bef3f28f..6c18e2f91f49 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -153,6 +153,32 @@ scm {
+@@ -153,6 +153,32 @@
  		};
  	};
  
@@ -51,7 +49,7 @@ index 8094bef3f28f..6c18e2f91f49 100644
  	soc: soc {
  		#address-cells = <0x1>;
  		#size-cells = <0x1>;
-@@ -421,6 +447,11 @@ tcsr_mutex: hwlock@1905000 {
+@@ -421,6 +447,11 @@
  			#hwlock-cells = <1>;
  		};
  
@@ -63,7 +61,7 @@ index 8094bef3f28f..6c18e2f91f49 100644
  		spmi_bus: spmi@200f000 {
  			compatible = "qcom,spmi-pmic-arb";
  			reg = <0x0200f000 0x001000>,
-@@ -934,6 +965,56 @@ IRQ_TYPE_LEVEL_HIGH>, /* int_c */
+@@ -934,6 +965,56 @@
  				      "axi_s_sticky";
  			status = "disabled";
  		};
@@ -120,6 +118,3 @@ index 8094bef3f28f..6c18e2f91f49 100644
  	};
  
  	timer {
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0132-arm64-dts-ipq8074-Add-WLAN-node.patch b/target/linux/ipq60xx/patches-5.15/0132-arm64-dts-ipq8074-Add-WLAN-node.patch
index ac494377d..d93cf1c28 100644
--- a/target/linux/ipq60xx/patches-5.15/0132-arm64-dts-ipq8074-Add-WLAN-node.patch
+++ b/target/linux/ipq60xx/patches-5.15/0132-arm64-dts-ipq8074-Add-WLAN-node.patch
@@ -13,11 +13,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 111 ++++++++++++++++++++++++++
  1 file changed, 111 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 6c18e2f91f49..6b743a0a740f 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -1015,6 +1015,117 @@ rpm_requests {
+@@ -1015,6 +1015,117 @@
  				};
  			};
  		};
@@ -135,6 +133,3 @@ index 6c18e2f91f49..6b743a0a740f 100644
  	};
  
  	timer {
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0133-clk-ipq-support-for-resetting-multiple-bits.patch b/target/linux/ipq60xx/patches-5.15/0133-clk-ipq-support-for-resetting-multiple-bits.patch
index fd1bd4fc6..93342cfa3 100644
--- a/target/linux/ipq60xx/patches-5.15/0133-clk-ipq-support-for-resetting-multiple-bits.patch
+++ b/target/linux/ipq60xx/patches-5.15/0133-clk-ipq-support-for-resetting-multiple-bits.patch
@@ -24,11 +24,9 @@ Signed-off-by: Rajkumar Ayyasamy <arajkuma@codeaurora.org>
  drivers/clk/qcom/reset.h | 1 +
  2 files changed, 3 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/clk/qcom/reset.c b/drivers/clk/qcom/reset.c
-index 819d194be8f7..8ad7b50dd534 100644
 --- a/drivers/clk/qcom/reset.c
 +++ b/drivers/clk/qcom/reset.c
-@@ -28,7 +28,7 @@ qcom_reset_assert(struct reset_controller_dev *rcdev, unsigned long id)
+@@ -28,7 +28,7 @@ qcom_reset_assert(struct reset_controlle
  
  	rst = to_qcom_reset_controller(rcdev);
  	map = &rst->reset_map[id];
@@ -37,7 +35,7 @@ index 819d194be8f7..8ad7b50dd534 100644
  
  	return regmap_update_bits(rst->regmap, map->reg, mask, mask);
  }
-@@ -42,7 +42,7 @@ qcom_reset_deassert(struct reset_controller_dev *rcdev, unsigned long id)
+@@ -42,7 +42,7 @@ qcom_reset_deassert(struct reset_control
  
  	rst = to_qcom_reset_controller(rcdev);
  	map = &rst->reset_map[id];
@@ -46,8 +44,6 @@ index 819d194be8f7..8ad7b50dd534 100644
  
  	return regmap_update_bits(rst->regmap, map->reg, mask, 0);
  }
-diff --git a/drivers/clk/qcom/reset.h b/drivers/clk/qcom/reset.h
-index 2a08b5e282c7..0410f83bf2bb 100644
 --- a/drivers/clk/qcom/reset.h
 +++ b/drivers/clk/qcom/reset.h
 @@ -11,6 +11,7 @@
@@ -58,6 +54,3 @@ index 2a08b5e282c7..0410f83bf2bb 100644
  };
  
  struct regmap;
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0134-clk-qcom-ipq8074-add-missing-networking-resets.patch b/target/linux/ipq60xx/patches-5.15/0134-clk-qcom-ipq8074-add-missing-networking-resets.patch
index 3e140bcc1..1004880b8 100644
--- a/target/linux/ipq60xx/patches-5.15/0134-clk-qcom-ipq8074-add-missing-networking-resets.patch
+++ b/target/linux/ipq60xx/patches-5.15/0134-clk-qcom-ipq8074-add-missing-networking-resets.patch
@@ -15,11 +15,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  include/dt-bindings/clock/qcom,gcc-ipq8074.h | 14 ++++++++++++++
  2 files changed, 28 insertions(+)
 
-diff --git a/drivers/clk/qcom/gcc-ipq8074.c b/drivers/clk/qcom/gcc-ipq8074.c
-index 7954a730aad2..069ad3b5bca0 100644
 --- a/drivers/clk/qcom/gcc-ipq8074.c
 +++ b/drivers/clk/qcom/gcc-ipq8074.c
-@@ -4827,6 +4827,20 @@ static const struct qcom_reset_map gcc_ipq8074_resets[] = {
+@@ -4827,6 +4827,20 @@ static const struct qcom_reset_map gcc_i
  	[GCC_PCIE1_AHB_ARES] = { 0x76040, 5 },
  	[GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 },
  	[GCC_WCSSAON_RESET] = { 0x59010, 0 },
@@ -40,8 +38,6 @@ index 7954a730aad2..069ad3b5bca0 100644
  };
  
  static struct gdsc *gcc_ipq8074_gdscs[] = {
-diff --git a/include/dt-bindings/clock/qcom,gcc-ipq8074.h b/include/dt-bindings/clock/qcom,gcc-ipq8074.h
-index 7b425cede707..1e9ef05a36dd 100644
 --- a/include/dt-bindings/clock/qcom,gcc-ipq8074.h
 +++ b/include/dt-bindings/clock/qcom,gcc-ipq8074.h
 @@ -368,6 +368,20 @@
@@ -65,6 +61,3 @@ index 7b425cede707..1e9ef05a36dd 100644
  
  #define USB0_GDSC				0
  #define USB1_GDSC				1
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0135-arm64-dts-ipq8074-add-label-to-clocks.patch b/target/linux/ipq60xx/patches-5.15/0135-arm64-dts-ipq8074-add-label-to-clocks.patch
index b39a580b2..deafccbeb 100644
--- a/target/linux/ipq60xx/patches-5.15/0135-arm64-dts-ipq8074-add-label-to-clocks.patch
+++ b/target/linux/ipq60xx/patches-5.15/0135-arm64-dts-ipq8074-add-label-to-clocks.patch
@@ -11,11 +11,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  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 6b743a0a740f..f30bf5ef6aab 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -15,7 +15,7 @@ / {
+@@ -15,7 +15,7 @@
  	compatible = "qcom,ipq8074";
  	interrupt-parent = <&intc>;
  
@@ -24,6 +22,3 @@ index 6b743a0a740f..f30bf5ef6aab 100644
  		sleep_clk: sleep_clk {
  			compatible = "fixed-clock";
  			clock-frequency = <32768>;
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0136-power-Add-Qualcomm-APM.patch b/target/linux/ipq60xx/patches-5.15/0136-power-Add-Qualcomm-APM.patch
index 2c1ab0dd7..e73afce71 100644
--- a/target/linux/ipq60xx/patches-5.15/0136-power-Add-Qualcomm-APM.patch
+++ b/target/linux/ipq60xx/patches-5.15/0136-power-Add-Qualcomm-APM.patch
@@ -19,8 +19,6 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  create mode 100644 drivers/power/qcom/apm.c
  create mode 100644 include/linux/power/qcom/apm.h
 
-diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
-index 696bf77a7042..235f3cbf2a54 100644
 --- a/drivers/power/Kconfig
 +++ b/drivers/power/Kconfig
 @@ -1,3 +1,4 @@
@@ -28,8 +26,6 @@ index 696bf77a7042..235f3cbf2a54 100644
  source "drivers/power/reset/Kconfig"
  source "drivers/power/supply/Kconfig"
 +source "drivers/power/qcom/Kconfig"
-diff --git a/drivers/power/Makefile b/drivers/power/Makefile
-index effbf0377f32..cd239e730b2b 100644
 --- a/drivers/power/Makefile
 +++ b/drivers/power/Makefile
 @@ -1,3 +1,4 @@
@@ -37,9 +33,6 @@ index effbf0377f32..cd239e730b2b 100644
  obj-$(CONFIG_POWER_RESET)	+= reset/
  obj-$(CONFIG_POWER_SUPPLY)	+= supply/
 +obj-$(CONFIG_QCOM_APM)		+= qcom/
-diff --git a/drivers/power/qcom/Kconfig b/drivers/power/qcom/Kconfig
-new file mode 100644
-index 000000000000..01993a6179d1
 --- /dev/null
 +++ b/drivers/power/qcom/Kconfig
 @@ -0,0 +1,7 @@
@@ -50,16 +43,10 @@ index 000000000000..01993a6179d1
 +	memory arrays. Interfaces with regulator drivers to ensure
 +	SRAM Vmin requirements are met across different performance
 +	levels.
-diff --git a/drivers/power/qcom/Makefile b/drivers/power/qcom/Makefile
-new file mode 100644
-index 000000000000..43a288e62ef1
 --- /dev/null
 +++ b/drivers/power/qcom/Makefile
 @@ -0,0 +1 @@
 +obj-$(CONFIG_QCOM_APM)		+= apm.o
-diff --git a/drivers/power/qcom/apm.c b/drivers/power/qcom/apm.c
-new file mode 100644
-index 000000000000..bd93358e3d34
 --- /dev/null
 +++ b/drivers/power/qcom/apm.c
 @@ -0,0 +1,944 @@
@@ -1007,9 +994,6 @@ index 000000000000..bd93358e3d34
 +
 +MODULE_DESCRIPTION("MSM Array Power Mux driver");
 +MODULE_LICENSE("GPL v2");
-diff --git a/include/linux/power/qcom/apm.h b/include/linux/power/qcom/apm.h
-new file mode 100644
-index 000000000000..432683578b76
 --- /dev/null
 +++ b/include/linux/power/qcom/apm.h
 @@ -0,0 +1,48 @@
@@ -1061,6 +1045,3 @@ index 000000000000..432683578b76
 +{ return -EPERM; }
 +#endif
 +#endif
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0137-regulator-add-Qualcomm-CPR-regulators.patch b/target/linux/ipq60xx/patches-5.15/0137-regulator-add-Qualcomm-CPR-regulators.patch
index 6f22eeb28..2f997e23a 100644
--- a/target/linux/ipq60xx/patches-5.15/0137-regulator-add-Qualcomm-CPR-regulators.patch
+++ b/target/linux/ipq60xx/patches-5.15/0137-regulator-add-Qualcomm-CPR-regulators.patch
@@ -23,8 +23,6 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  create mode 100644 drivers/regulator/cpr4-apss-regulator.c
  create mode 100644 include/soc/qcom/socinfo.h
 
-diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
-index 4fd13b06231f..92164c80cbc4 100644
 --- a/drivers/regulator/Kconfig
 +++ b/drivers/regulator/Kconfig
 @@ -1423,5 +1423,38 @@ config REGULATOR_QCOM_LABIBB
@@ -66,11 +64,9 @@ index 4fd13b06231f..92164c80cbc4 100644
 +
  endif
  
-diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
-index 9e382b50a5ef..2e521cb39e7e 100644
 --- a/drivers/regulator/Makefile
 +++ b/drivers/regulator/Makefile
-@@ -105,6 +105,9 @@ obj-$(CONFIG_REGULATOR_QCOM_RPMH) += qcom-rpmh-regulator.o
+@@ -105,6 +105,9 @@ obj-$(CONFIG_REGULATOR_QCOM_RPMH) += qco
  obj-$(CONFIG_REGULATOR_QCOM_SMD_RPM) += qcom_smd-regulator.o
  obj-$(CONFIG_REGULATOR_QCOM_SPMI) += qcom_spmi-regulator.o
  obj-$(CONFIG_REGULATOR_QCOM_USB_VBUS) += qcom_usb_vbus-regulator.o
@@ -80,9 +76,6 @@ index 9e382b50a5ef..2e521cb39e7e 100644
  obj-$(CONFIG_REGULATOR_PALMAS) += palmas-regulator.o
  obj-$(CONFIG_REGULATOR_PCA9450) += pca9450-regulator.o
  obj-$(CONFIG_REGULATOR_PF8X00) += pf8x00-regulator.o
-diff --git a/drivers/regulator/cpr3-npu-regulator.c b/drivers/regulator/cpr3-npu-regulator.c
-new file mode 100644
-index 000000000000..e808073c0850
 --- /dev/null
 +++ b/drivers/regulator/cpr3-npu-regulator.c
 @@ -0,0 +1,695 @@
@@ -781,9 +774,6 @@ index 000000000000..e808073c0850
 +MODULE_DESCRIPTION("QCOM CPR3 NPU regulator driver");
 +MODULE_LICENSE("Dual BSD/GPLv2");
 +MODULE_ALIAS("platform:npu-ipq807x");
-diff --git a/drivers/regulator/cpr3-regulator.c b/drivers/regulator/cpr3-regulator.c
-new file mode 100644
-index 000000000000..d5d8a1a0b061
 --- /dev/null
 +++ b/drivers/regulator/cpr3-regulator.c
 @@ -0,0 +1,5112 @@
@@ -5899,9 +5889,6 @@ index 000000000000..d5d8a1a0b061
 +
 +	return 0;
 +}
-diff --git a/drivers/regulator/cpr3-regulator.h b/drivers/regulator/cpr3-regulator.h
-new file mode 100644
-index 000000000000..7c69c4630543
 --- /dev/null
 +++ b/drivers/regulator/cpr3-regulator.h
 @@ -0,0 +1,1211 @@
@@ -7116,9 +7103,6 @@ index 000000000000..7c69c4630543
 +#endif /* CONFIG_REGULATOR_CPR3 */
 +
 +#endif /* __REGULATOR_CPR_REGULATOR_H__ */
-diff --git a/drivers/regulator/cpr3-util.c b/drivers/regulator/cpr3-util.c
-new file mode 100644
-index 000000000000..45493af714e2
 --- /dev/null
 +++ b/drivers/regulator/cpr3-util.c
 @@ -0,0 +1,2750 @@
@@ -9872,9 +9856,6 @@ index 000000000000..45493af714e2
 +	kfree(ro_scale);
 +	return rc;
 +}
-diff --git a/drivers/regulator/cpr4-apss-regulator.c b/drivers/regulator/cpr4-apss-regulator.c
-new file mode 100644
-index 000000000000..114e2acb25ff
 --- /dev/null
 +++ b/drivers/regulator/cpr4-apss-regulator.c
 @@ -0,0 +1,1819 @@
@@ -11697,9 +11678,6 @@ index 000000000000..114e2acb25ff
 +
 +arch_initcall(cpr4_regulator_init);
 +module_exit(cpr4_regulator_exit);
-diff --git a/include/soc/qcom/socinfo.h b/include/soc/qcom/socinfo.h
-new file mode 100644
-index 000000000000..db43446163a9
 --- /dev/null
 +++ b/include/soc/qcom/socinfo.h
 @@ -0,0 +1,463 @@
@@ -12166,6 +12144,3 @@ index 000000000000..db43446163a9
 +}
 +
 +#endif /* _ARCH_ARM_MACH_MSM_SOCINFO_H_ */
--- 
-2.37.2
-
diff --git a/target/linux/ipq60xx/patches-5.15/0603-net-core-Flag-to-identify-ingress-shaping-done-for-e.patch b/target/linux/ipq60xx/patches-5.15/0603-net-core-Flag-to-identify-ingress-shaping-done-for-e.patch
index b47bf6e4d..b3c76115f 100644
--- a/target/linux/ipq60xx/patches-5.15/0603-net-core-Flag-to-identify-ingress-shaping-done-for-e.patch
+++ b/target/linux/ipq60xx/patches-5.15/0603-net-core-Flag-to-identify-ingress-shaping-done-for-e.patch
@@ -22,7 +22,7 @@ variable names created with 603.
   *	@tc_at_ingress: used within tc_classify to distinguish in/egress
   *	@redirected: packet was redirected by packet classifier
   *	@from_ingress: packet was redirected from the ingress path
-@@ -903,6 +904,7 @@ struct sk_buff {
+@@ -904,6 +905,7 @@ struct sk_buff {
  #ifdef CONFIG_NET_CLS_ACT
  	__u8			tc_skip_classify:1;
  	__u8			tc_at_ingress:1;
diff --git a/target/linux/ipq60xx/patches-5.15/1000-arm64-dts-add-OpenWrt-DTS-files.patch b/target/linux/ipq60xx/patches-5.15/1000-arm64-dts-add-OpenWrt-DTS-files.patch
index b868bfeda..27976140e 100644
--- a/target/linux/ipq60xx/patches-5.15/1000-arm64-dts-add-OpenWrt-DTS-files.patch
+++ b/target/linux/ipq60xx/patches-5.15/1000-arm64-dts-add-OpenWrt-DTS-files.patch
@@ -12,11 +12,9 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
  arch/arm64/boot/dts/qcom/Makefile | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
-index 70516508be56..27a7e3f98465 100644
 --- a/arch/arm64/boot/dts/qcom/Makefile
 +++ b/arch/arm64/boot/dts/qcom/Makefile
-@@ -4,6 +4,10 @@ dtb-$(CONFIG_ARCH_QCOM)	+= apq8094-sony-xperia-kitakami-karin_windy.dtb
+@@ -4,6 +4,10 @@ dtb-$(CONFIG_ARCH_QCOM)	+= apq8094-sony-
  dtb-$(CONFIG_ARCH_QCOM)	+= apq8096-db820c.dtb
  dtb-$(CONFIG_ARCH_QCOM)	+= apq8096-ifc6640.dtb
  dtb-$(CONFIG_ARCH_QCOM)	+= ipq6018-cp01-c1.dtb
@@ -27,6 +25,3 @@ index 70516508be56..27a7e3f98465 100644
  dtb-$(CONFIG_ARCH_QCOM)	+= ipq8074-hk01.dtb
  dtb-$(CONFIG_ARCH_QCOM)	+= ipq8074-hk10-c1.dtb
  dtb-$(CONFIG_ARCH_QCOM)	+= ipq8074-hk10-c2.dtb
--- 
-2.37.1
-
diff --git a/target/linux/ipq60xx/patches-5.15/1001-arm64-dts-qcom-ipq6018-Add-mdio-bus-description.patch b/target/linux/ipq60xx/patches-5.15/1001-arm64-dts-qcom-ipq6018-Add-mdio-bus-description.patch
index f72ef1249..c3d04ad7e 100644
--- a/target/linux/ipq60xx/patches-5.15/1001-arm64-dts-qcom-ipq6018-Add-mdio-bus-description.patch
+++ b/target/linux/ipq60xx/patches-5.15/1001-arm64-dts-qcom-ipq6018-Add-mdio-bus-description.patch
@@ -14,11 +14,9 @@ Link: https://lore.kernel.org/r/ef01a79ccc6ef86dc3a10d0fa3331794d49e9859.1646031
  arch/arm64/boot/dts/qcom/ipq6018.dtsi | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq6018.dtsi b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
-index ce4c2b4a5fc0..5ac0aafc620e 100644
 --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
-@@ -623,6 +623,16 @@ qrtr_requests {
+@@ -623,6 +623,16 @@
  			};
  		};
  
@@ -35,6 +33,3 @@ index ce4c2b4a5fc0..5ac0aafc620e 100644
  		qusb_phy_1: qusb@59000 {
  			compatible = "qcom,ipq6018-qusb2-phy";
  			reg = <0x0 0x059000 0x0 0x180>;
--- 
-2.37.1
-
diff --git a/target/linux/ipq60xx/patches-5.15/1002-clk-qcom-add-support-for-hw-controlled-RCG.patch b/target/linux/ipq60xx/patches-5.15/1002-clk-qcom-add-support-for-hw-controlled-RCG.patch
index d1dfe7a8f..1bc079525 100644
--- a/target/linux/ipq60xx/patches-5.15/1002-clk-qcom-add-support-for-hw-controlled-RCG.patch
+++ b/target/linux/ipq60xx/patches-5.15/1002-clk-qcom-add-support-for-hw-controlled-RCG.patch
@@ -22,11 +22,9 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
  drivers/clk/qcom/clk-rcg2.c | 29 ++++++++++++++++++++++-------
  2 files changed, 26 insertions(+), 7 deletions(-)
 
-diff --git a/drivers/clk/qcom/clk-rcg.h b/drivers/clk/qcom/clk-rcg.h
-index 248115a018bc..f53fb0acfd93 100644
 --- a/drivers/clk/qcom/clk-rcg.h
 +++ b/drivers/clk/qcom/clk-rcg.h
-@@ -135,6 +135,7 @@ extern const struct clk_ops clk_dyn_rcg_ops;
+@@ -135,6 +135,7 @@ extern const struct clk_ops clk_dyn_rcg_
   * @mnd_width: number of bits in m/n/d values
   * @hid_width: number of bits in half integer divider
   * @safe_src_index: safe src index value
@@ -44,11 +42,9 @@ index 248115a018bc..f53fb0acfd93 100644
  	const struct parent_map	*parent_map;
  	const struct freq_tbl	*freq_tbl;
  	struct clk_regmap	clkr;
-diff --git a/drivers/clk/qcom/clk-rcg2.c b/drivers/clk/qcom/clk-rcg2.c
-index fdbbda1f2ba4..f696aca67162 100644
 --- a/drivers/clk/qcom/clk-rcg2.c
 +++ b/drivers/clk/qcom/clk-rcg2.c
-@@ -98,7 +98,7 @@ static u8 clk_rcg2_get_parent(struct clk_hw *hw)
+@@ -98,7 +98,7 @@ err:
  	return 0;
  }
  
@@ -57,7 +53,7 @@ index fdbbda1f2ba4..f696aca67162 100644
  {
  	int count, ret;
  	u32 cmd;
-@@ -110,6 +110,9 @@ static int update_config(struct clk_rcg2 *rcg)
+@@ -110,6 +110,9 @@ static int update_config(struct clk_rcg2
  	if (ret)
  		return ret;
  
@@ -67,7 +63,7 @@ index fdbbda1f2ba4..f696aca67162 100644
  	/* Wait for update to take effect */
  	for (count = 500; count > 0; count--) {
  		ret = regmap_read(rcg->clkr.regmap, rcg->cmd_rcgr + CMD_REG, &cmd);
-@@ -128,14 +131,19 @@ static int clk_rcg2_set_parent(struct clk_hw *hw, u8 index)
+@@ -128,14 +131,19 @@ static int clk_rcg2_set_parent(struct cl
  {
  	struct clk_rcg2 *rcg = to_clk_rcg2(hw);
  	int ret;
@@ -88,7 +84,7 @@ index fdbbda1f2ba4..f696aca67162 100644
  }
  
  /*
-@@ -312,12 +320,19 @@ static int __clk_rcg2_configure(struct clk_rcg2 *rcg, const struct freq_tbl *f)
+@@ -312,12 +320,19 @@ static int __clk_rcg2_configure(struct c
  static int clk_rcg2_configure(struct clk_rcg2 *rcg, const struct freq_tbl *f)
  {
  	int ret;
@@ -109,7 +105,7 @@ index fdbbda1f2ba4..f696aca67162 100644
  }
  
  static int __clk_rcg2_set_rate(struct clk_hw *hw, unsigned long rate,
-@@ -448,7 +463,7 @@ static int clk_rcg2_set_duty_cycle(struct clk_hw *hw, struct clk_duty *duty)
+@@ -448,7 +463,7 @@ static int clk_rcg2_set_duty_cycle(struc
  	if (ret)
  		return ret;
  
@@ -118,7 +114,7 @@ index fdbbda1f2ba4..f696aca67162 100644
  }
  
  const struct clk_ops clk_rcg2_ops = {
-@@ -910,7 +925,7 @@ static int clk_gfx3d_set_rate_and_parent(struct clk_hw *hw, unsigned long rate,
+@@ -910,7 +925,7 @@ static int clk_gfx3d_set_rate_and_parent
  	if (ret)
  		return ret;
  
@@ -127,7 +123,7 @@ index fdbbda1f2ba4..f696aca67162 100644
  }
  
  static int clk_gfx3d_set_rate(struct clk_hw *hw, unsigned long rate,
-@@ -1022,7 +1037,7 @@ static int clk_rcg2_shared_enable(struct clk_hw *hw)
+@@ -1022,7 +1037,7 @@ static int clk_rcg2_shared_enable(struct
  	if (ret)
  		return ret;
  
@@ -136,7 +132,7 @@ index fdbbda1f2ba4..f696aca67162 100644
  	if (ret)
  		return ret;
  
-@@ -1053,7 +1068,7 @@ static void clk_rcg2_shared_disable(struct clk_hw *hw)
+@@ -1053,7 +1068,7 @@ static void clk_rcg2_shared_disable(stru
  	regmap_write(rcg->clkr.regmap, rcg->cmd_rcgr + CFG_REG,
  		     rcg->safe_src_index << CFG_SRC_SEL_SHIFT);
  
@@ -145,6 +141,3 @@ index fdbbda1f2ba4..f696aca67162 100644
  
  	clk_rcg2_clear_force_enable(hw);
  
--- 
-2.37.1
-
diff --git a/target/linux/ipq60xx/patches-5.15/1003-clk-qcom-ipq6018-add-missing-clock-flags.patch b/target/linux/ipq60xx/patches-5.15/1003-clk-qcom-ipq6018-add-missing-clock-flags.patch
index 1ad472908..4f2b410f4 100644
--- a/target/linux/ipq60xx/patches-5.15/1003-clk-qcom-ipq6018-add-missing-clock-flags.patch
+++ b/target/linux/ipq60xx/patches-5.15/1003-clk-qcom-ipq6018-add-missing-clock-flags.patch
@@ -21,11 +21,9 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
  drivers/clk/qcom/gcc-ipq6018.c | 19 +++++++++++++++----
  1 file changed, 15 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/clk/qcom/gcc-ipq6018.c b/drivers/clk/qcom/gcc-ipq6018.c
-index 3f9c2f61a5d9..cf11c9aa5004 100644
 --- a/drivers/clk/qcom/gcc-ipq6018.c
 +++ b/drivers/clk/qcom/gcc-ipq6018.c
-@@ -62,6 +62,7 @@ static struct clk_alpha_pll gpll0_main = {
+@@ -62,6 +62,7 @@ static struct clk_alpha_pll gpll0_main =
  			},
  			.num_parents = 1,
  			.ops = &clk_alpha_pll_ops,
@@ -33,7 +31,7 @@ index 3f9c2f61a5d9..cf11c9aa5004 100644
  		},
  	},
  };
-@@ -150,6 +151,7 @@ static struct clk_alpha_pll gpll6_main = {
+@@ -150,6 +151,7 @@ static struct clk_alpha_pll gpll6_main =
  			},
  			.num_parents = 1,
  			.ops = &clk_alpha_pll_ops,
@@ -41,7 +39,7 @@ index 3f9c2f61a5d9..cf11c9aa5004 100644
  		},
  	},
  };
-@@ -181,6 +183,7 @@ static struct clk_alpha_pll gpll4_main = {
+@@ -181,6 +183,7 @@ static struct clk_alpha_pll gpll4_main =
  			},
  			.num_parents = 1,
  			.ops = &clk_alpha_pll_ops,
@@ -49,7 +47,7 @@ index 3f9c2f61a5d9..cf11c9aa5004 100644
  		},
  	},
  };
-@@ -211,6 +214,7 @@ static struct clk_rcg2 pcnoc_bfdcd_clk_src = {
+@@ -211,6 +214,7 @@ static struct clk_rcg2 pcnoc_bfdcd_clk_s
  	.freq_tbl = ftbl_pcnoc_bfdcd_clk_src,
  	.hid_width = 5,
  	.parent_map = gcc_xo_gpll0_gpll0_out_main_div2_map,
@@ -57,7 +55,7 @@ index 3f9c2f61a5d9..cf11c9aa5004 100644
  	.clkr.hw.init = &(struct clk_init_data){
  		.name = "pcnoc_bfdcd_clk_src",
  		.parent_data = gcc_xo_gpll0_gpll0_out_main_div2,
-@@ -232,6 +236,7 @@ static struct clk_alpha_pll gpll2_main = {
+@@ -232,6 +236,7 @@ static struct clk_alpha_pll gpll2_main =
  			},
  			.num_parents = 1,
  			.ops = &clk_alpha_pll_ops,
@@ -65,7 +63,7 @@ index 3f9c2f61a5d9..cf11c9aa5004 100644
  		},
  	},
  };
-@@ -456,6 +461,7 @@ static struct clk_branch gcc_sleep_clk_src = {
+@@ -456,6 +461,7 @@ static struct clk_branch gcc_sleep_clk_s
  			},
  			.num_parents = 1,
  			.ops = &clk_branch2_ops,
@@ -73,7 +71,7 @@ index 3f9c2f61a5d9..cf11c9aa5004 100644
  		},
  	},
  };
-@@ -960,6 +966,7 @@ static struct clk_rcg2 nss_crypto_clk_src = {
+@@ -960,6 +966,7 @@ static struct clk_rcg2 nss_crypto_clk_sr
  	.mnd_width = 16,
  	.hid_width = 5,
  	.parent_map = gcc_xo_nss_crypto_pll_gpll0_map,
@@ -81,7 +79,7 @@ index 3f9c2f61a5d9..cf11c9aa5004 100644
  	.clkr.hw.init = &(struct clk_init_data){
  		.name = "nss_crypto_clk_src",
  		.parent_data = gcc_xo_nss_crypto_pll_gpll0,
-@@ -1131,6 +1138,7 @@ static struct clk_rcg2 nss_ubi0_clk_src = {
+@@ -1131,6 +1138,7 @@ static struct clk_rcg2 nss_ubi0_clk_src
  	.freq_tbl = ftbl_nss_ubi_clk_src,
  	.hid_width = 5,
  	.parent_map = gcc_xo_ubi32_gpll0_gpll2_gpll4_gpll6_map,
@@ -89,7 +87,7 @@ index 3f9c2f61a5d9..cf11c9aa5004 100644
  	.clkr.hw.init = &(struct clk_init_data){
  		.name = "nss_ubi0_clk_src",
  		.parent_data = gcc_xo_ubi32_pll_gpll0_gpll2_gpll4_gpll6,
-@@ -1869,7 +1877,7 @@ static struct clk_branch gcc_apss_ahb_clk = {
+@@ -1869,7 +1877,7 @@ static struct clk_branch gcc_apss_ahb_cl
  			.parent_hws = (const struct clk_hw *[]){
  					&apss_ahb_postdiv_clk_src.clkr.hw },
  			.num_parents = 1,
@@ -98,7 +96,7 @@ index 3f9c2f61a5d9..cf11c9aa5004 100644
  			.ops = &clk_branch2_ops,
  		},
  	},
-@@ -1891,11 +1899,13 @@ static struct clk_rcg2 system_noc_bfdcd_clk_src = {
+@@ -1891,11 +1899,13 @@ static struct clk_rcg2 system_noc_bfdcd_
  	.freq_tbl = ftbl_system_noc_bfdcd_clk_src,
  	.hid_width = 5,
  	.parent_map = gcc_xo_gpll0_gpll6_gpll0_out_main_div2_map,
@@ -112,7 +110,7 @@ index 3f9c2f61a5d9..cf11c9aa5004 100644
  	},
  };
  
-@@ -1945,7 +1955,7 @@ static struct clk_branch gcc_apss_axi_clk = {
+@@ -1945,7 +1955,7 @@ static struct clk_branch gcc_apss_axi_cl
  			.parent_hws = (const struct clk_hw *[]){
  					&apss_axi_clk_src.clkr.hw },
  			.num_parents = 1,
@@ -130,7 +128,7 @@ index 3f9c2f61a5d9..cf11c9aa5004 100644
  			.ops = &clk_branch2_ops,
  		},
  	},
-@@ -3163,6 +3173,7 @@ static struct clk_branch gcc_nssnoc_ppe_cfg_clk = {
+@@ -3163,6 +3173,7 @@ static struct clk_branch gcc_nssnoc_ppe_
  			.name = "gcc_nssnoc_ppe_cfg_clk",
  			.parent_hws = (const struct clk_hw *[]){
  					&nss_ppe_clk_src.clkr.hw },
@@ -138,7 +136,7 @@ index 3f9c2f61a5d9..cf11c9aa5004 100644
  			.flags = CLK_SET_RATE_PARENT,
  			.ops = &clk_branch2_ops,
  		},
-@@ -3521,7 +3532,7 @@ static struct clk_branch gcc_qdss_dap_clk = {
+@@ -3521,7 +3532,7 @@ static struct clk_branch gcc_qdss_dap_cl
  			.parent_hws = (const struct clk_hw *[]){
  					&qdss_dap_sync_clk_src.hw },
  			.num_parents = 1,
@@ -147,6 +145,3 @@ index 3f9c2f61a5d9..cf11c9aa5004 100644
  			.ops = &clk_branch2_ops,
  		},
  	},
--- 
-2.37.1
-
diff --git a/target/linux/ipq60xx/patches-5.15/1004-clk-qcom-ipq6018-add-missing-clocks.patch b/target/linux/ipq60xx/patches-5.15/1004-clk-qcom-ipq6018-add-missing-clocks.patch
index 335e83b87..0ecfc9538 100644
--- a/target/linux/ipq60xx/patches-5.15/1004-clk-qcom-ipq6018-add-missing-clocks.patch
+++ b/target/linux/ipq60xx/patches-5.15/1004-clk-qcom-ipq6018-add-missing-clocks.patch
@@ -12,11 +12,9 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
  drivers/clk/qcom/gcc-ipq6018.c | 619 ++++++++++++++++++++++++++++++++-
  1 file changed, 603 insertions(+), 16 deletions(-)
 
-diff --git a/drivers/clk/qcom/gcc-ipq6018.c b/drivers/clk/qcom/gcc-ipq6018.c
-index cf11c9aa5004..69d06dd4aeb8 100644
 --- a/drivers/clk/qcom/gcc-ipq6018.c
 +++ b/drivers/clk/qcom/gcc-ipq6018.c
-@@ -223,6 +223,19 @@ static struct clk_rcg2 pcnoc_bfdcd_clk_src = {
+@@ -223,6 +223,19 @@ static struct clk_rcg2 pcnoc_bfdcd_clk_s
  	},
  };
  
@@ -36,7 +34,7 @@ index cf11c9aa5004..69d06dd4aeb8 100644
  static struct clk_alpha_pll gpll2_main = {
  	.offset = 0x4a000,
  	.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
-@@ -505,6 +518,19 @@ static struct clk_rcg2 snoc_nssnoc_bfdcd_clk_src = {
+@@ -505,6 +518,19 @@ static struct clk_rcg2 snoc_nssnoc_bfdcd
  	},
  };
  
@@ -56,7 +54,7 @@ index cf11c9aa5004..69d06dd4aeb8 100644
  static const struct freq_tbl ftbl_apss_ahb_clk_src[] = {
  	F(24000000, P_XO, 1, 0, 0),
  	F(25000000, P_GPLL0_DIV2, 16, 0, 0),
-@@ -1909,6 +1935,19 @@ static struct clk_rcg2 system_noc_bfdcd_clk_src = {
+@@ -1909,6 +1935,19 @@ static struct clk_rcg2 system_noc_bfdcd_
  	},
  };
  
@@ -76,7 +74,7 @@ index cf11c9aa5004..69d06dd4aeb8 100644
  static const struct freq_tbl ftbl_ubi32_mem_noc_bfdcd_clk_src[] = {
  	F(24000000, P_XO, 1, 0, 0),
  	F(307670000, P_BIAS_PLL_NSS_NOC, 1.5, 0, 0),
-@@ -1944,6 +1983,19 @@ static struct clk_rcg2 ubi32_mem_noc_bfdcd_clk_src = {
+@@ -1944,6 +1983,19 @@ static struct clk_rcg2 ubi32_mem_noc_bfd
  	},
  };
  
@@ -96,7 +94,7 @@ index cf11c9aa5004..69d06dd4aeb8 100644
  static struct clk_branch gcc_apss_axi_clk = {
  	.halt_reg = 0x46020,
  	.halt_check = BRANCH_HALT_VOTED,
-@@ -2138,6 +2190,22 @@ static struct clk_branch gcc_blsp1_qup5_spi_apps_clk = {
+@@ -2138,6 +2190,22 @@ static struct clk_branch gcc_blsp1_qup5_
  	},
  };
  
@@ -119,7 +117,7 @@ index cf11c9aa5004..69d06dd4aeb8 100644
  static struct clk_branch gcc_blsp1_qup6_spi_apps_clk = {
  	.halt_reg = 0x0700c,
  	.clkr = {
-@@ -2681,6 +2749,454 @@ static struct clk_rcg2 lpass_q6_axim_clk_src = {
+@@ -2681,6 +2749,454 @@ static struct clk_rcg2 lpass_q6_axim_clk
  	},
  };
  
@@ -574,7 +572,7 @@ index cf11c9aa5004..69d06dd4aeb8 100644
  static struct freq_tbl ftbl_rbcpr_wcss_clk_src[] = {
  	F(24000000, P_XO, 1, 0, 0),
  	F(50000000, P_GPLL0, 16, 0, 0),
-@@ -2700,6 +3216,23 @@ static struct clk_rcg2 rbcpr_wcss_clk_src = {
+@@ -2700,6 +3216,23 @@ static struct clk_rcg2 rbcpr_wcss_clk_sr
  	},
  };
  
@@ -598,7 +596,7 @@ index cf11c9aa5004..69d06dd4aeb8 100644
  static struct clk_branch gcc_lpass_core_axim_clk = {
  	.halt_reg = 0x1F028,
  	.clkr = {
-@@ -3522,6 +4055,22 @@ static struct clk_branch gcc_prng_ahb_clk = {
+@@ -3522,6 +4055,22 @@ static struct clk_branch gcc_prng_ahb_cl
  	},
  };
  
@@ -621,7 +619,7 @@ index cf11c9aa5004..69d06dd4aeb8 100644
  static struct clk_branch gcc_qdss_dap_clk = {
  	.halt_reg = 0x29084,
  	.clkr = {
-@@ -4195,6 +4744,9 @@ static struct clk_hw *gcc_ipq6018_hws[] = {
+@@ -4195,6 +4744,9 @@ static struct clk_hw *gcc_ipq6018_hws[]
  	&gpll6_out_main_div2.hw,
  	&qdss_dap_sync_clk_src.hw,
  	&qdss_tsctr_div2_clk_src.hw,
@@ -631,7 +629,7 @@ index cf11c9aa5004..69d06dd4aeb8 100644
  };
  
  static struct clk_regmap *gcc_ipq6018_clks[] = {
-@@ -4292,6 +4844,7 @@ static struct clk_regmap *gcc_ipq6018_clks[] = {
+@@ -4292,6 +4844,7 @@ static struct clk_regmap *gcc_ipq6018_cl
  	[GCC_BLSP1_QUP4_SPI_APPS_CLK] = &gcc_blsp1_qup4_spi_apps_clk.clkr,
  	[GCC_BLSP1_QUP5_I2C_APPS_CLK] = &gcc_blsp1_qup5_i2c_apps_clk.clkr,
  	[GCC_BLSP1_QUP5_SPI_APPS_CLK] = &gcc_blsp1_qup5_spi_apps_clk.clkr,
@@ -639,7 +637,7 @@ index cf11c9aa5004..69d06dd4aeb8 100644
  	[GCC_BLSP1_QUP6_SPI_APPS_CLK] = &gcc_blsp1_qup6_spi_apps_clk.clkr,
  	[GCC_BLSP1_UART1_APPS_CLK] = &gcc_blsp1_uart1_apps_clk.clkr,
  	[GCC_BLSP1_UART2_APPS_CLK] = &gcc_blsp1_uart2_apps_clk.clkr,
-@@ -4357,6 +4910,7 @@ static struct clk_regmap *gcc_ipq6018_clks[] = {
+@@ -4357,6 +4910,7 @@ static struct clk_regmap *gcc_ipq6018_cl
  	[GCC_SYS_NOC_PCIE0_AXI_CLK] = &gcc_sys_noc_pcie0_axi_clk.clkr,
  	[GCC_PCIE0_PIPE_CLK] = &gcc_pcie0_pipe_clk.clkr,
  	[GCC_PRNG_AHB_CLK] = &gcc_prng_ahb_clk.clkr,
@@ -647,7 +645,7 @@ index cf11c9aa5004..69d06dd4aeb8 100644
  	[GCC_QDSS_DAP_CLK] = &gcc_qdss_dap_clk.clkr,
  	[GCC_QPIC_AHB_CLK] = &gcc_qpic_ahb_clk.clkr,
  	[GCC_QPIC_CLK] = &gcc_qpic_clk.clkr,
-@@ -4398,9 +4952,35 @@ static struct clk_regmap *gcc_ipq6018_clks[] = {
+@@ -4398,9 +4952,35 @@ static struct clk_regmap *gcc_ipq6018_cl
  	[PCIE0_RCHNG_CLK_SRC] = &pcie0_rchng_clk_src.clkr,
  	[GCC_PCIE0_AXI_S_BRIDGE_CLK] = &gcc_pcie0_axi_s_bridge_clk.clkr,
  	[PCIE0_RCHNG_CLK] = &gcc_pcie0_rchng_clk.clkr,
@@ -683,7 +681,7 @@ index cf11c9aa5004..69d06dd4aeb8 100644
  	[GCC_LPASS_CORE_AXIM_CLK] = &gcc_lpass_core_axim_clk.clkr,
  	[LPASS_CORE_AXIM_CLK_SRC] = &lpass_core_axim_clk_src.clkr,
  	[GCC_LPASS_SNOC_CFG_CLK] = &gcc_lpass_snoc_cfg_clk.clkr,
-@@ -4416,6 +4996,9 @@ static struct clk_regmap *gcc_ipq6018_clks[] = {
+@@ -4416,6 +4996,9 @@ static struct clk_regmap *gcc_ipq6018_cl
  	[GCC_MEM_NOC_UBI32_CLK] = &gcc_mem_noc_ubi32_clk.clkr,
  	[GCC_MEM_NOC_LPASS_CLK] = &gcc_mem_noc_lpass_clk.clkr,
  	[GCC_SNOC_LPASS_CFG_CLK] = &gcc_snoc_lpass_cfg_clk.clkr,
@@ -693,7 +691,7 @@ index cf11c9aa5004..69d06dd4aeb8 100644
  	[QDSS_STM_CLK_SRC] = &qdss_stm_clk_src.clkr,
  	[QDSS_TRACECLKIN_CLK_SRC] = &qdss_traceclkin_clk_src.clkr,
  };
-@@ -4528,24 +5111,24 @@ static const struct qcom_reset_map gcc_ipq6018_resets[] = {
+@@ -4528,24 +5111,24 @@ static const struct qcom_reset_map gcc_i
  	[GCC_PCIE0_AHB_ARES] = { 0x75040, 5 },
  	[GCC_PCIE0_AXI_MASTER_STICKY_ARES] = { 0x75040, 6 },
  	[GCC_PCIE0_AXI_SLAVE_STICKY_ARES] = { 0x75040, 7 },
@@ -734,7 +732,7 @@ index cf11c9aa5004..69d06dd4aeb8 100644
  	[GCC_LPASS_BCR] = {0x1F000, 0},
  	[GCC_UBI32_TBU_BCR] = {0x65000, 0},
  	[GCC_LPASS_TBU_BCR] = {0x6C000, 0},
-@@ -4597,6 +5180,10 @@ static const struct qcom_cc_desc gcc_ipq6018_desc = {
+@@ -4597,6 +5180,10 @@ static const struct qcom_cc_desc gcc_ipq
  static int gcc_ipq6018_probe(struct platform_device *pdev)
  {
  	struct regmap *regmap;
@@ -745,6 +743,3 @@ index cf11c9aa5004..69d06dd4aeb8 100644
  
  	regmap = qcom_cc_map(pdev, &gcc_ipq6018_desc);
  	if (IS_ERR(regmap))
--- 
-2.37.1
-
diff --git a/target/linux/ipq60xx/patches-5.15/1005-clk-qcom-ipq6018-update-Huayra-PLL-settings.patch b/target/linux/ipq60xx/patches-5.15/1005-clk-qcom-ipq6018-update-Huayra-PLL-settings.patch
index edbfa9d7d..9f8ced9bd 100644
--- a/target/linux/ipq60xx/patches-5.15/1005-clk-qcom-ipq6018-update-Huayra-PLL-settings.patch
+++ b/target/linux/ipq60xx/patches-5.15/1005-clk-qcom-ipq6018-update-Huayra-PLL-settings.patch
@@ -13,11 +13,9 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
  drivers/clk/qcom/gcc-ipq6018.c   | 9 ++++++---
  2 files changed, 12 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/clk/qcom/clk-alpha-pll.c b/drivers/clk/qcom/clk-alpha-pll.c
-index 8f65b9bdafce..6179f2404216 100644
 --- a/drivers/clk/qcom/clk-alpha-pll.c
 +++ b/drivers/clk/qcom/clk-alpha-pll.c
-@@ -287,6 +287,12 @@ void clk_alpha_pll_configure(struct clk_alpha_pll *pll, struct regmap *regmap,
+@@ -287,6 +287,12 @@ void clk_alpha_pll_configure(struct clk_
  
  	regmap_update_bits(regmap, PLL_USER_CTL(pll), mask, val);
  
@@ -30,8 +28,6 @@ index 8f65b9bdafce..6179f2404216 100644
  	if (pll->flags & SUPPORTS_FSM_MODE)
  		qcom_pll_set_fsm_mode(regmap, PLL_MODE(pll), 6, 0);
  }
-diff --git a/drivers/clk/qcom/gcc-ipq6018.c b/drivers/clk/qcom/gcc-ipq6018.c
-index 69d06dd4aeb8..98f0e950f5c1 100644
 --- a/drivers/clk/qcom/gcc-ipq6018.c
 +++ b/drivers/clk/qcom/gcc-ipq6018.c
 @@ -4711,15 +4711,18 @@ static struct clk_branch gcc_dcc_clk = {
@@ -56,6 +52,3 @@ index 69d06dd4aeb8..98f0e950f5c1 100644
  };
  
  static const struct alpha_pll_config nss_crypto_pll_config = {
--- 
-2.37.1
-
diff --git a/target/linux/ipq60xx/patches-5.15/1006-clk-qcom-pq6018-workaround-networking-clock-parenting.patch b/target/linux/ipq60xx/patches-5.15/1006-clk-qcom-pq6018-workaround-networking-clock-parenting.patch
index 4affa4c08..fdaf3f359 100644
--- a/target/linux/ipq60xx/patches-5.15/1006-clk-qcom-pq6018-workaround-networking-clock-parenting.patch
+++ b/target/linux/ipq60xx/patches-5.15/1006-clk-qcom-pq6018-workaround-networking-clock-parenting.patch
@@ -17,11 +17,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  drivers/clk/qcom/gcc-ipq6018.c | 39 +++++++++++++++++-----------------
  1 file changed, 19 insertions(+), 20 deletions(-)
 
-diff --git a/drivers/clk/qcom/gcc-ipq6018.c b/drivers/clk/qcom/gcc-ipq6018.c
-index 764a8aa98a76f4..767996448ca948 100644
 --- a/drivers/clk/qcom/gcc-ipq6018.c
 +++ b/drivers/clk/qcom/gcc-ipq6018.c
-@@ -369,7 +369,7 @@ static const struct freq_tbl ftbl_nss_ppe_clk_src[] = {
+@@ -387,7 +387,7 @@ static const struct freq_tbl ftbl_nss_pp
  
  static const struct clk_parent_data gcc_xo_bias_gpll0_gpll4_nss_ubi32[] = {
  	{ .fw_name = "xo" },
@@ -30,7 +28,7 @@ index 764a8aa98a76f4..767996448ca948 100644
  	{ .hw = &gpll0.clkr.hw },
  	{ .hw = &gpll4.clkr.hw },
  	{ .hw = &nss_crypto_pll.clkr.hw },
-@@ -535,12 +535,12 @@ static const struct freq_tbl ftbl_nss_port5_rx_clk_src[] = {
+@@ -567,12 +567,12 @@ static const struct freq_tbl ftbl_nss_po
  static const struct clk_parent_data
  gcc_xo_uniphy0_rx_tx_uniphy1_rx_tx_ubi32_bias[] = {
  	{ .fw_name = "xo" },
@@ -48,7 +46,7 @@ index 764a8aa98a76f4..767996448ca948 100644
  };
  
  static const struct parent_map
-@@ -582,12 +582,12 @@ static const struct freq_tbl ftbl_nss_port5_tx_clk_src[] = {
+@@ -614,12 +614,12 @@ static const struct freq_tbl ftbl_nss_po
  static const struct clk_parent_data
  gcc_xo_uniphy0_tx_rx_uniphy1_tx_rx_ubi32_bias[] = {
  	{ .fw_name = "xo" },
@@ -66,7 +64,7 @@ index 764a8aa98a76f4..767996448ca948 100644
  };
  
  static const struct parent_map
-@@ -723,10 +723,10 @@ static const struct freq_tbl ftbl_nss_port1_rx_clk_src[] = {
+@@ -755,10 +755,10 @@ static const struct freq_tbl ftbl_nss_po
  
  static const struct clk_parent_data gcc_xo_uniphy0_rx_tx_ubi32_bias[] = {
  	{ .fw_name = "xo" },
@@ -80,7 +78,7 @@ index 764a8aa98a76f4..767996448ca948 100644
  };
  
  static const struct parent_map gcc_xo_uniphy0_rx_tx_ubi32_bias_map[] = {
-@@ -759,10 +759,10 @@ static const struct freq_tbl ftbl_nss_port1_tx_clk_src[] = {
+@@ -791,10 +791,10 @@ static const struct freq_tbl ftbl_nss_po
  
  static const struct clk_parent_data gcc_xo_uniphy0_tx_rx_ubi32_bias[] = {
  	{ .fw_name = "xo" },
@@ -94,7 +92,7 @@ index 764a8aa98a76f4..767996448ca948 100644
  };
  
  static const struct parent_map gcc_xo_uniphy0_tx_rx_ubi32_bias_map[] = {
-@@ -1906,12 +1906,11 @@ static const struct freq_tbl ftbl_ubi32_mem_noc_bfdcd_clk_src[] = {
+@@ -1955,12 +1955,11 @@ static const struct freq_tbl ftbl_ubi32_
  	{ }
  };
  
diff --git a/target/linux/ipq60xx/patches-5.15/1007-arm64-dts-qcom-ipq6018-Add-missing-fixed-clocks.patch b/target/linux/ipq60xx/patches-5.15/1007-arm64-dts-qcom-ipq6018-Add-missing-fixed-clocks.patch
index 2aa0011c3..0452e6a70 100644
--- a/target/linux/ipq60xx/patches-5.15/1007-arm64-dts-qcom-ipq6018-Add-missing-fixed-clocks.patch
+++ b/target/linux/ipq60xx/patches-5.15/1007-arm64-dts-qcom-ipq6018-Add-missing-fixed-clocks.patch
@@ -8,11 +8,9 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
  arch/arm64/boot/dts/qcom/ipq6018.dtsi | 22 ++++++++++++++++++++--
  1 file changed, 20 insertions(+), 2 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq6018.dtsi b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
-index 5ac0aafc620e..a9cc92ed03eb 100644
 --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
-@@ -27,6 +27,18 @@ xo: xo {
+@@ -27,6 +27,18 @@
  			clock-frequency = <24000000>;
  			#clock-cells = <0>;
  		};
@@ -31,7 +29,7 @@ index 5ac0aafc620e..a9cc92ed03eb 100644
  	};
  
  	cpus: cpus {
-@@ -247,8 +259,14 @@ qpic_pins: qpic-pins {
+@@ -247,8 +259,14 @@
  		gcc: gcc@1800000 {
  			compatible = "qcom,gcc-ipq6018";
  			reg = <0x0 0x01800000 0x0 0x80000>;
@@ -48,6 +46,3 @@ index 5ac0aafc620e..a9cc92ed03eb 100644
  			#clock-cells = <1>;
  			#reset-cells = <1>;
  		};
--- 
-2.37.1
-
diff --git a/target/linux/ipq60xx/patches-5.15/1008-remoteproc-wcss-Add-ipq6018-support-in-remoteproc.patch b/target/linux/ipq60xx/patches-5.15/1008-remoteproc-wcss-Add-ipq6018-support-in-remoteproc.patch
index 247ec31b7..0e4203e8c 100644
--- a/target/linux/ipq60xx/patches-5.15/1008-remoteproc-wcss-Add-ipq6018-support-in-remoteproc.patch
+++ b/target/linux/ipq60xx/patches-5.15/1008-remoteproc-wcss-Add-ipq6018-support-in-remoteproc.patch
@@ -8,8 +8,6 @@ Signed-off-by: anusha <anusharao@codeaurora.org>
  drivers/remoteproc/qcom_q6v5_wcss.c | 20 ++++++++++++++++++--
  1 file changed, 18 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
-index 92c240976f55..1c33f7878736 100644
 --- a/drivers/remoteproc/qcom_q6v5_wcss.c
 +++ b/drivers/remoteproc/qcom_q6v5_wcss.c
 @@ -91,7 +91,7 @@
@@ -21,7 +19,7 @@ index 92c240976f55..1c33f7878736 100644
  	WCSS_QCS404,
  };
  
-@@ -902,7 +902,7 @@ static int q6v5_wcss_init_mmio(struct q6v5_wcss *wcss,
+@@ -902,7 +902,7 @@ static int q6v5_wcss_init_mmio(struct q6
  	if (!wcss->reg_base)
  		return -ENOMEM;
  
@@ -30,7 +28,7 @@ index 92c240976f55..1c33f7878736 100644
  		res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rmb");
  		wcss->rmb_base = devm_ioremap_resource(&pdev->dev, res);
  		if (IS_ERR(wcss->rmb_base))
-@@ -1173,6 +1173,21 @@ static int q6v5_wcss_remove(struct platform_device *pdev)
+@@ -1173,6 +1173,21 @@ static int q6v5_wcss_remove(struct platf
  	return 0;
  }
  
@@ -52,7 +50,7 @@ index 92c240976f55..1c33f7878736 100644
  static const struct wcss_data wcss_ipq8074_res_init = {
  	.init_clock = ipq8074_init_clock,
  	.q6_firmware_name = "IPQ8074/q6_fw.mdt",
-@@ -1206,6 +1221,7 @@ static const struct wcss_data wcss_qcs404_res_init = {
+@@ -1206,6 +1221,7 @@ static const struct wcss_data wcss_qcs40
  };
  
  static const struct of_device_id q6v5_wcss_of_match[] = {
@@ -60,6 +58,3 @@ index 92c240976f55..1c33f7878736 100644
  	{ .compatible = "qcom,ipq8074-wcss-pil", .data = &wcss_ipq8074_res_init },
  	{ .compatible = "qcom,qcs404-wcss-pil", .data = &wcss_qcs404_res_init },
  	{ },
--- 
-2.37.1
-
diff --git a/target/linux/ipq60xx/patches-5.15/1009-ipq6018-rproc-Add-non-secure-Q6-bringup-sequence.patch b/target/linux/ipq60xx/patches-5.15/1009-ipq6018-rproc-Add-non-secure-Q6-bringup-sequence.patch
index 550e022b4..32f57586f 100644
--- a/target/linux/ipq60xx/patches-5.15/1009-ipq6018-rproc-Add-non-secure-Q6-bringup-sequence.patch
+++ b/target/linux/ipq60xx/patches-5.15/1009-ipq6018-rproc-Add-non-secure-Q6-bringup-sequence.patch
@@ -12,11 +12,9 @@ Signed-off-by: Manikanta Mylavarapu <quic_mmanikan@quicinc.com>
  drivers/remoteproc/qcom_q6v5_wcss.c   | 223 ++++++++++++++++++++++++--
  2 files changed, 227 insertions(+), 16 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq6018.dtsi b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
-index a9cc92ed03eb..d8da83aa8bda 100644
 --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
-@@ -618,8 +618,24 @@ q6v5_wcss: remoteproc@cd00000 {
+@@ -618,8 +618,24 @@
  				      "wcss_reset",
  				      "wcss_q6_reset";
  
@@ -43,8 +41,6 @@ index a9cc92ed03eb..d8da83aa8bda 100644
  
  			qcom,halt-regs = <&tcsr 0x18000 0x1b000 0xe000>;
  
-diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
-index 1c33f7878736..d07b710c42db 100644
 --- a/drivers/remoteproc/qcom_q6v5_wcss.c
 +++ b/drivers/remoteproc/qcom_q6v5_wcss.c
 @@ -27,6 +27,7 @@
@@ -161,7 +157,7 @@ index 1c33f7878736..d07b710c42db 100644
  	/* Assert resets, stop core */
  	val = readl(wcss->reg_base + Q6SS_RESET_REG);
  	val |= Q6SS_CORE_ARES | Q6SS_BUS_ARES_ENABLE | Q6SS_STOP_CORE;
-@@ -195,7 +268,19 @@ static int q6v5_wcss_reset(struct q6v5_wcss *wcss)
+@@ -195,7 +268,19 @@ static int q6v5_wcss_reset(struct q6v5_w
  	writel(val, wcss->reg_base + Q6SS_PWR_CTL_REG);
  	udelay(1);
  
@@ -181,7 +177,7 @@ index 1c33f7878736..d07b710c42db 100644
  	val |= Q6SS_LDO_BYP;
  	writel(val, wcss->reg_base + Q6SS_PWR_CTL_REG);
  
-@@ -205,6 +290,7 @@ static int q6v5_wcss_reset(struct q6v5_wcss *wcss)
+@@ -205,6 +290,7 @@ static int q6v5_wcss_reset(struct q6v5_w
  	writel(val, wcss->reg_base + Q6SS_PWR_CTL_REG);
  
  	/* Deassert memory peripheral sleep and L2 memory standby */
@@ -189,7 +185,7 @@ index 1c33f7878736..d07b710c42db 100644
  	val |= Q6SS_L2DATA_STBY_N | Q6SS_SLP_RET_N;
  	writel(val, wcss->reg_base + Q6SS_PWR_CTL_REG);
  
-@@ -219,7 +305,10 @@ static int q6v5_wcss_reset(struct q6v5_wcss *wcss)
+@@ -219,7 +305,10 @@ static int q6v5_wcss_reset(struct q6v5_w
  		 * array to turn on.
  		 */
  		val |= readl(wcss->reg_base + Q6SS_MEM_PWR_CTL);
@@ -201,7 +197,7 @@ index 1c33f7878736..d07b710c42db 100644
  	}
  	/* Remove word line clamp */
  	val = readl(wcss->reg_base + Q6SS_PWR_CTL_REG);
-@@ -227,6 +316,7 @@ static int q6v5_wcss_reset(struct q6v5_wcss *wcss)
+@@ -227,6 +316,7 @@ static int q6v5_wcss_reset(struct q6v5_w
  	writel(val, wcss->reg_base + Q6SS_PWR_CTL_REG);
  
  	/* Remove IO clamp */
@@ -209,7 +205,7 @@ index 1c33f7878736..d07b710c42db 100644
  	val &= ~Q6SS_CLAMP_IO;
  	writel(val, wcss->reg_base + Q6SS_PWR_CTL_REG);
  
-@@ -245,6 +335,16 @@ static int q6v5_wcss_reset(struct q6v5_wcss *wcss)
+@@ -245,6 +335,16 @@ static int q6v5_wcss_reset(struct q6v5_w
  	val &= ~Q6SS_STOP_CORE;
  	writel(val, wcss->reg_base + Q6SS_RESET_REG);
  
@@ -226,7 +222,7 @@ index 1c33f7878736..d07b710c42db 100644
  	return 0;
  }
  
-@@ -376,7 +476,7 @@ static int q6v5_wcss_qcs404_power_on(struct q6v5_wcss *wcss)
+@@ -376,7 +476,7 @@ static int q6v5_wcss_qcs404_power_on(str
  	/* Read CLKOFF bit to go low indicating CLK is enabled */
  	ret = readl_poll_timeout(wcss->reg_base + Q6SS_XO_CBCR,
  				 val, !(val & BIT(31)), 1,
@@ -235,7 +231,7 @@ index 1c33f7878736..d07b710c42db 100644
  	if (ret) {
  		dev_err(wcss->dev,
  			"xo cbcr enabling timed out (rc:%d)\n", ret);
-@@ -528,13 +628,18 @@ static void q6v5_wcss_halt_axi_port(struct q6v5_wcss *wcss,
+@@ -528,13 +628,18 @@ static void q6v5_wcss_halt_axi_port(stru
  	unsigned long timeout;
  	unsigned int val;
  	int ret;
@@ -258,7 +254,7 @@ index 1c33f7878736..d07b710c42db 100644
  	regmap_write(halt_map, offset + AXI_HALTREQ_REG, 1);
  
  	/* Wait for halt */
-@@ -547,12 +652,14 @@ static void q6v5_wcss_halt_axi_port(struct q6v5_wcss *wcss,
+@@ -547,12 +652,14 @@ static void q6v5_wcss_halt_axi_port(stru
  		msleep(1);
  	}
  
@@ -278,7 +274,7 @@ index 1c33f7878736..d07b710c42db 100644
  }
  
  static int q6v5_qcs404_wcss_shutdown(struct q6v5_wcss *wcss)
-@@ -621,6 +728,7 @@ static int q6v5_qcs404_wcss_shutdown(struct q6v5_wcss *wcss)
+@@ -621,6 +728,7 @@ static int q6v5_qcs404_wcss_shutdown(str
  
  static int q6v5_wcss_powerdown(struct q6v5_wcss *wcss)
  {
@@ -286,7 +282,7 @@ index 1c33f7878736..d07b710c42db 100644
  	int ret;
  	u32 val;
  
-@@ -638,21 +746,26 @@ static int q6v5_wcss_powerdown(struct q6v5_wcss *wcss)
+@@ -638,21 +746,26 @@ static int q6v5_wcss_powerdown(struct q6
  	writel(val, wcss->rmb_base + SSCAON_CONFIG);
  
  	/* 4 - SSCAON_CONFIG 1 */
@@ -314,7 +310,7 @@ index 1c33f7878736..d07b710c42db 100644
  
  	/* 7 - Disable WCSSAON_CONFIG 13 */
  	val = readl(wcss->rmb_base + SSCAON_CONFIG);
-@@ -662,6 +775,13 @@ static int q6v5_wcss_powerdown(struct q6v5_wcss *wcss)
+@@ -662,6 +775,13 @@ static int q6v5_wcss_powerdown(struct q6
  	/* 8 - De-assert WCSS/Q6 HALTREQ */
  	reset_control_assert(wcss->wcss_reset);
  
@@ -328,7 +324,7 @@ index 1c33f7878736..d07b710c42db 100644
  	return 0;
  }
  
-@@ -670,6 +790,12 @@ static int q6v5_q6_powerdown(struct q6v5_wcss *wcss)
+@@ -670,6 +790,12 @@ static int q6v5_q6_powerdown(struct q6v5
  	int ret;
  	u32 val;
  	int i;
@@ -341,7 +337,7 @@ index 1c33f7878736..d07b710c42db 100644
  
  	/* 1 - Halt Q6 bus interface */
  	q6v5_wcss_halt_axi_port(wcss, wcss->halt_map, wcss->halt_q6);
-@@ -685,14 +811,17 @@ static int q6v5_q6_powerdown(struct q6v5_wcss *wcss)
+@@ -685,14 +811,17 @@ static int q6v5_q6_powerdown(struct q6v5
  	writel(val, wcss->reg_base + Q6SS_PWR_CTL_REG);
  
  	/* 4 - Clamp WL */
@@ -359,7 +355,7 @@ index 1c33f7878736..d07b710c42db 100644
  	val &= ~Q6SS_SLP_RET_N;
  	writel(val, wcss->reg_base + Q6SS_PWR_CTL_REG);
  
-@@ -710,6 +839,7 @@ static int q6v5_q6_powerdown(struct q6v5_wcss *wcss)
+@@ -710,6 +839,7 @@ static int q6v5_q6_powerdown(struct q6v5
  	writel(val, wcss->reg_base + Q6SS_PWR_CTL_REG);
  
  	/* 9 - Turn off BHS */
@@ -367,7 +363,7 @@ index 1c33f7878736..d07b710c42db 100644
  	val &= ~Q6SS_BHS_ON;
  	writel(val, wcss->reg_base + Q6SS_PWR_CTL_REG);
  	udelay(1);
-@@ -717,7 +847,7 @@ static int q6v5_q6_powerdown(struct q6v5_wcss *wcss)
+@@ -717,7 +847,7 @@ static int q6v5_q6_powerdown(struct q6v5
  	/* 10 - Wait till BHS Reset is done */
  	ret = readl_poll_timeout(wcss->reg_base + Q6SS_BHS_STATUS,
  				 val, !(val & BHS_EN_REST_ACK), 1000,
@@ -376,7 +372,7 @@ index 1c33f7878736..d07b710c42db 100644
  	if (ret) {
  		dev_err(wcss->dev, "BHS_STATUS not OFF (rc:%d)\n", ret);
  		return ret;
-@@ -725,9 +855,23 @@ static int q6v5_q6_powerdown(struct q6v5_wcss *wcss)
+@@ -725,9 +855,23 @@ static int q6v5_q6_powerdown(struct q6v5
  
  	/* 11 -  Assert WCSS reset */
  	reset_control_assert(wcss->wcss_reset);
@@ -400,7 +396,7 @@ index 1c33f7878736..d07b710c42db 100644
  
  	return 0;
  }
-@@ -966,6 +1110,57 @@ static int q6v5_alloc_memory_region(struct q6v5_wcss *wcss)
+@@ -966,6 +1110,57 @@ static int q6v5_alloc_memory_region(stru
  	return 0;
  }
  
@@ -458,7 +454,7 @@ index 1c33f7878736..d07b710c42db 100644
  static int ipq8074_init_clock(struct q6v5_wcss *wcss)
  {
  	int ret;
-@@ -1174,7 +1369,7 @@ static int q6v5_wcss_remove(struct platform_device *pdev)
+@@ -1174,7 +1369,7 @@ static int q6v5_wcss_remove(struct platf
  }
  
  static const struct wcss_data wcss_ipq6018_res_init = {
@@ -467,6 +463,3 @@ index 1c33f7878736..d07b710c42db 100644
  	.q6_firmware_name = "IPQ6018/q6_fw.mdt",
  	.m3_firmware_name = "IPQ6018/m3_fw.mdt",
  	.crash_reason_smem = WCSS_CRASH_REASON,
--- 
-2.37.1
-
diff --git a/target/linux/ipq60xx/patches-5.15/1010-Simplify-ipq6018-rproc-Add-non-secure-Q6-bringup-seq.patch b/target/linux/ipq60xx/patches-5.15/1010-Simplify-ipq6018-rproc-Add-non-secure-Q6-bringup-seq.patch
index a62f30b9c..fb6777eca 100644
--- a/target/linux/ipq60xx/patches-5.15/1010-Simplify-ipq6018-rproc-Add-non-secure-Q6-bringup-seq.patch
+++ b/target/linux/ipq60xx/patches-5.15/1010-Simplify-ipq6018-rproc-Add-non-secure-Q6-bringup-seq.patch
@@ -8,11 +8,9 @@ Subject: [PATCH 1010/1011] Simplify "ipq6018: rproc: Add non secure Q6 bringup
  drivers/remoteproc/qcom_q6v5_wcss.c | 25 +++++++++----------------
  1 file changed, 9 insertions(+), 16 deletions(-)
 
-diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
-index d07b710c42db..694d97a0d807 100644
 --- a/drivers/remoteproc/qcom_q6v5_wcss.c
 +++ b/drivers/remoteproc/qcom_q6v5_wcss.c
-@@ -628,18 +628,13 @@ static void q6v5_wcss_halt_axi_port(struct q6v5_wcss *wcss,
+@@ -628,18 +628,13 @@ static void q6v5_wcss_halt_axi_port(stru
  	unsigned long timeout;
  	unsigned int val;
  	int ret;
@@ -35,7 +33,7 @@ index d07b710c42db..694d97a0d807 100644
  	regmap_write(halt_map, offset + AXI_HALTREQ_REG, 1);
  
  	/* Wait for halt */
-@@ -652,14 +647,12 @@ static void q6v5_wcss_halt_axi_port(struct q6v5_wcss *wcss,
+@@ -652,14 +647,12 @@ static void q6v5_wcss_halt_axi_port(stru
  		msleep(1);
  	}
  
@@ -55,6 +53,3 @@ index d07b710c42db..694d97a0d807 100644
  }
  
  static int q6v5_qcs404_wcss_shutdown(struct q6v5_wcss *wcss)
--- 
-2.37.1
-
diff --git a/target/linux/ipq60xx/patches-5.15/1013-psci-dont-advertise-OSI-support-for-IPQ6018.patch b/target/linux/ipq60xx/patches-5.15/1013-psci-dont-advertise-OSI-support-for-IPQ6018.patch
index 8063854f3..b3b6764ff 100644
--- a/target/linux/ipq60xx/patches-5.15/1013-psci-dont-advertise-OSI-support-for-IPQ6018.patch
+++ b/target/linux/ipq60xx/patches-5.15/1013-psci-dont-advertise-OSI-support-for-IPQ6018.patch
@@ -17,11 +17,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  drivers/firmware/psci/psci.c | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
-diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c
-index cfb448eabdaa..658905bce78d 100644
 --- a/drivers/firmware/psci/psci.c
 +++ b/drivers/firmware/psci/psci.c
-@@ -86,6 +86,18 @@ static inline bool psci_has_ext_power_state(void)
+@@ -86,6 +86,18 @@ static inline bool psci_has_ext_power_st
  
  bool psci_has_osi_support(void)
  {
@@ -40,6 +38,3 @@ index cfb448eabdaa..658905bce78d 100644
  	return psci_cpu_suspend_feature & PSCI_1_0_OS_INITIATED;
  }
  
--- 
-2.37.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0003-v5.16-arm64-dts-qcom-msm8996-Move-clock-cells-to-QMP-PHY-c.patch b/target/linux/ipq807x/patches-5.15/0003-v5.16-arm64-dts-qcom-msm8996-Move-clock-cells-to-QMP-PHY-c.patch
index 7357f806f..99e74c6a7 100644
--- a/target/linux/ipq807x/patches-5.15/0003-v5.16-arm64-dts-qcom-msm8996-Move-clock-cells-to-QMP-PHY-c.patch
+++ b/target/linux/ipq807x/patches-5.15/0003-v5.16-arm64-dts-qcom-msm8996-Move-clock-cells-to-QMP-PHY-c.patch
@@ -72,7 +72,7 @@ Link: https://lore.kernel.org/r/20210929034253.24570-4-shawn.guo@linaro.org
  				clock-output-names = "pcie_0_pipe_clk_src";
  				clocks = <&gcc GCC_PCIE_0_PIPE_CLK>;
  				clock-names = "pipe0";
-@@ -2586,7 +2586,6 @@
+@@ -2583,7 +2583,6 @@
  		usb3phy: phy@7410000 {
  			compatible = "qcom,msm8996-qmp-usb3-phy";
  			reg = <0x07410000 0x1c4>;
@@ -80,7 +80,7 @@ Link: https://lore.kernel.org/r/20210929034253.24570-4-shawn.guo@linaro.org
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges;
-@@ -2607,6 +2606,7 @@
+@@ -2604,6 +2603,7 @@
  				      <0x07410600 0x1a8>;
  				#phy-cells = <0>;
  
@@ -108,15 +108,15 @@ Link: https://lore.kernel.org/r/20210929034253.24570-4-shawn.guo@linaro.org
  				clock-output-names = "usb3_phy_pipe_clk_src";
 --- a/arch/arm64/boot/dts/qcom/sm8350.dtsi
 +++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi
-@@ -1070,7 +1070,6 @@
- 			reg = <0 0x01d87000 0 0xe10>;
+@@ -1112,7 +1112,6 @@
+ 			reg = <0 0x01d87000 0 0x1c4>;
  			#address-cells = <2>;
  			#size-cells = <2>;
 -			#clock-cells = <1>;
  			ranges;
  			clock-names = "ref",
  				      "ref_aux";
-@@ -1205,7 +1204,6 @@
+@@ -1247,7 +1246,6 @@
  			      <0 0x088e8000 0 0x20>;
  			reg-names = "reg-base", "dp_com";
  			status = "disabled";
@@ -124,7 +124,7 @@ Link: https://lore.kernel.org/r/20210929034253.24570-4-shawn.guo@linaro.org
  			#address-cells = <2>;
  			#size-cells = <2>;
  			ranges;
-@@ -1238,7 +1236,6 @@
+@@ -1280,7 +1278,6 @@
  			compatible = "qcom,sm8350-qmp-usb3-uni-phy";
  			reg = <0 0x088eb000 0 0x200>;
  			status = "disabled";
diff --git a/target/linux/ipq807x/patches-5.15/0004-v5.16-arm64-dts-qcom-Correct-QMP-PHY-child-node-name.patch b/target/linux/ipq807x/patches-5.15/0004-v5.16-arm64-dts-qcom-Correct-QMP-PHY-child-node-name.patch
index 8f5f275f1..69d3cd137 100644
--- a/target/linux/ipq807x/patches-5.15/0004-v5.16-arm64-dts-qcom-Correct-QMP-PHY-child-node-name.patch
+++ b/target/linux/ipq807x/patches-5.15/0004-v5.16-arm64-dts-qcom-Correct-QMP-PHY-child-node-name.patch
@@ -90,7 +90,7 @@ Link: https://lore.kernel.org/r/20210929034253.24570-5-shawn.guo@linaro.org
  				reg = <0x00037000 0x130>,
  				      <0x00037200 0x200>,
  				      <0x00037400 0x1dc>;
-@@ -1746,7 +1746,7 @@
+@@ -1743,7 +1743,7 @@
  			reset-names = "ufsphy";
  			status = "disabled";
  
@@ -99,7 +99,7 @@ Link: https://lore.kernel.org/r/20210929034253.24570-5-shawn.guo@linaro.org
  				reg = <0x627400 0x12c>,
  				      <0x627600 0x200>,
  				      <0x627c00 0x1b4>;
-@@ -2600,7 +2600,7 @@
+@@ -2597,7 +2597,7 @@
  			reset-names = "phy", "common";
  			status = "disabled";
  
@@ -224,7 +224,7 @@ Link: https://lore.kernel.org/r/20210929034253.24570-5-shawn.guo@linaro.org
  				reg = <0 0x1c06200 0 0x170>, /* tx */
  				      <0 0x1c06400 0 0x200>, /* rx */
  				      <0 0x1c06800 0 0x1f0>, /* pcs */
-@@ -1567,7 +1567,7 @@
+@@ -1569,7 +1569,7 @@
  
  			status = "disabled";
  
@@ -233,7 +233,7 @@ Link: https://lore.kernel.org/r/20210929034253.24570-5-shawn.guo@linaro.org
  				reg = <0 0x1c0e200 0 0x170>, /* tx0 */
  				      <0 0x1c0e400 0 0x200>, /* rx0 */
  				      <0 0x1c0ea00 0 0x1f0>, /* pcs */
-@@ -1673,7 +1673,7 @@
+@@ -1677,7 +1677,7 @@
  
  			status = "disabled";
  
@@ -242,7 +242,7 @@ Link: https://lore.kernel.org/r/20210929034253.24570-5-shawn.guo@linaro.org
  				reg = <0 0x1c16200 0 0x170>, /* tx0 */
  				      <0 0x1c16400 0 0x200>, /* rx0 */
  				      <0 0x1c16a00 0 0x1f0>, /* pcs */
-@@ -1750,7 +1750,7 @@
+@@ -1756,7 +1756,7 @@
  			reset-names = "ufsphy";
  			status = "disabled";
  
@@ -251,7 +251,7 @@ Link: https://lore.kernel.org/r/20210929034253.24570-5-shawn.guo@linaro.org
  				reg = <0 0x01d87400 0 0x108>,
  				      <0 0x01d87600 0 0x1e0>,
  				      <0 0x01d87c00 0 0x1dc>,
-@@ -2330,7 +2330,7 @@
+@@ -2336,7 +2336,7 @@
  				 <&gcc GCC_USB3_PHY_SEC_BCR>;
  			reset-names = "phy", "common";
  
@@ -262,7 +262,7 @@ Link: https://lore.kernel.org/r/20210929034253.24570-5-shawn.guo@linaro.org
  				      <0 0x088eb800 0 0x800>;
 --- a/arch/arm64/boot/dts/qcom/sm8350.dtsi
 +++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi
-@@ -1080,7 +1080,7 @@
+@@ -1122,7 +1122,7 @@
  			reset-names = "ufsphy";
  			status = "disabled";
  
diff --git a/target/linux/ipq807x/patches-5.15/0011-v5.18-arm64-dts-ipq8074-add-SMEM-support.patch b/target/linux/ipq807x/patches-5.15/0011-v5.18-arm64-dts-ipq8074-add-SMEM-support.patch
index 940f01531..dd7ff3e5a 100644
--- a/target/linux/ipq807x/patches-5.15/0011-v5.18-arm64-dts-ipq8074-add-SMEM-support.patch
+++ b/target/linux/ipq807x/patches-5.15/0011-v5.18-arm64-dts-ipq8074-add-SMEM-support.patch
@@ -11,11 +11,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 20 ++++++++++++++++++++
  1 file changed, 20 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 91436f0a653a..adce47affbef 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -76,6 +76,20 @@ psci {
+@@ -76,6 +76,20 @@
  		method = "smc";
  	};
  
@@ -36,7 +34,7 @@ index 91436f0a653a..adce47affbef 100644
  	firmware {
  		scm {
  			compatible = "qcom,scm-ipq8074", "qcom,scm";
-@@ -331,6 +345,12 @@ gcc: gcc@1800000 {
+@@ -331,6 +345,12 @@
  			#reset-cells = <0x1>;
  		};
  
@@ -49,6 +47,3 @@ index 91436f0a653a..adce47affbef 100644
  		spmi_bus: spmi@200f000 {
  			compatible = "qcom,spmi-pmic-arb";
  			reg = <0x0200f000 0x001000>,
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0101-arm64-dts-ipq8074-add-reserved-memory-nodes.patch b/target/linux/ipq807x/patches-5.15/0101-arm64-dts-ipq8074-add-reserved-memory-nodes.patch
index f4a964d83..cba302095 100644
--- a/target/linux/ipq807x/patches-5.15/0101-arm64-dts-ipq8074-add-reserved-memory-nodes.patch
+++ b/target/linux/ipq807x/patches-5.15/0101-arm64-dts-ipq8074-add-reserved-memory-nodes.patch
@@ -17,11 +17,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 40 +++++++++++++++++++++++++++
  1 file changed, 40 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index adce47affbef..94de2bd6596f 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -81,6 +81,31 @@ reserved-memory {
+@@ -81,6 +81,31 @@
  		#size-cells = <2>;
  		ranges;
  
@@ -53,7 +51,7 @@ index adce47affbef..94de2bd6596f 100644
  		smem@4ab00000 {
  			compatible = "qcom,smem";
  			reg = <0x0 0x4ab00000 0x0 0x00100000>;
-@@ -88,6 +113,21 @@ smem@4ab00000 {
+@@ -88,6 +113,21 @@
  
  			hwlocks = <&tcsr_mutex 0>;
  		};
@@ -75,6 +73,3 @@ index adce47affbef..94de2bd6596f 100644
  	};
  
  	firmware {
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0103-phy-qcom-qmp-Add-IPQ8074-PCIe-Gen3-QMP-PHY-support.patch b/target/linux/ipq807x/patches-5.15/0103-phy-qcom-qmp-Add-IPQ8074-PCIe-Gen3-QMP-PHY-support.patch
index 8f562e2a6..62a36baa3 100644
--- a/target/linux/ipq807x/patches-5.15/0103-phy-qcom-qmp-Add-IPQ8074-PCIe-Gen3-QMP-PHY-support.patch
+++ b/target/linux/ipq807x/patches-5.15/0103-phy-qcom-qmp-Add-IPQ8074-PCIe-Gen3-QMP-PHY-support.patch
@@ -17,9 +17,6 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  2 files changed, 308 insertions(+), 2 deletions(-)
  create mode 100644 drivers/phy/qualcomm/phy-qcom-pcie3-qmp.h
 
-diff --git a/drivers/phy/qualcomm/phy-qcom-pcie3-qmp.h b/drivers/phy/qualcomm/phy-qcom-pcie3-qmp.h
-new file mode 100644
-index 000000000000..070bde355836
 --- /dev/null
 +++ b/drivers/phy/qualcomm/phy-qcom-pcie3-qmp.h
 @@ -0,0 +1,139 @@
@@ -162,8 +159,6 @@ index 000000000000..070bde355836
 +#define PCS_PCIE_PRESET_P10_POST			0x4e0
 +
 +#endif
-diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
-index 06b04606dd7e..7d139754889a 100644
 --- a/drivers/phy/qualcomm/phy-qcom-qmp.c
 +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
 @@ -23,6 +23,7 @@
@@ -174,7 +169,7 @@ index 06b04606dd7e..7d139754889a 100644
  
  /* QPHY_SW_RESET bit */
  #define SW_RESET				BIT(0)
-@@ -812,6 +813,132 @@ static const struct qmp_phy_init_tbl ipq8074_pcie_pcs_tbl[] = {
+@@ -812,6 +813,132 @@ static const struct qmp_phy_init_tbl ipq
  	QMP_PHY_INIT_CFG_L(QPHY_START_CTRL, 0x3),
  };
  
@@ -307,7 +302,7 @@ index 06b04606dd7e..7d139754889a 100644
  static const struct qmp_phy_init_tbl sdm845_qmp_pcie_serdes_tbl[] = {
  	QMP_PHY_INIT_CFG(QSERDES_V3_COM_BIAS_EN_CLKBUFLR_EN, 0x14),
  	QMP_PHY_INIT_CFG(QSERDES_V3_COM_CLK_SELECT, 0x30),
-@@ -3194,6 +3321,36 @@ static const struct qmp_phy_cfg ipq6018_pciephy_cfg = {
+@@ -3194,6 +3321,36 @@ static const struct qmp_phy_cfg ipq6018_
  	.pwrdn_delay_max	= 1005,		/* us */
  };
  
@@ -344,7 +339,7 @@ index 06b04606dd7e..7d139754889a 100644
  static const struct qmp_phy_cfg sdm845_qmp_pciephy_cfg = {
  	.type = PHY_TYPE_PCIE,
  	.nlanes = 1,
-@@ -5138,8 +5295,15 @@ static int phy_pipe_clk_register(struct qcom_qmp *qmp, struct device_node *np)
+@@ -5138,8 +5295,15 @@ static int phy_pipe_clk_register(struct
  
  	init.ops = &clk_fixed_rate_ops;
  
@@ -362,16 +357,13 @@ index 06b04606dd7e..7d139754889a 100644
  	fixed->hw.init = &init;
  
  	ret = devm_clk_hw_register(qmp->dev, &fixed->hw);
-@@ -5529,6 +5693,9 @@ static const struct of_device_id qcom_qmp_phy_of_match_table[] = {
- 	}, {
+@@ -5539,6 +5703,9 @@ static const struct of_device_id qcom_qm
  		.compatible = "qcom,ipq6018-qmp-usb3-phy",
  		.data = &ipq8074_usb3phy_cfg,
-+	}, {
+ 	}, {
 +		.compatible = "qcom,ipq8074-qmp-pcie-gen3-phy",
 +		.data = &ipq8074_pciephy_gen3_cfg,
- 	}, {
++	}, {
  		.compatible = "qcom,sc7180-qmp-usb3-phy",
  		.data = &sc7180_usb3phy_cfg,
--- 
-2.35.1
-
+ 	}, {
diff --git a/target/linux/ipq807x/patches-5.15/0104-arm64-dts-qcom-ipq8074-enable-the-GICv2m-support.patch b/target/linux/ipq807x/patches-5.15/0104-arm64-dts-qcom-ipq8074-enable-the-GICv2m-support.patch
index 7cfb7d967..72e3a4086 100644
--- a/target/linux/ipq807x/patches-5.15/0104-arm64-dts-qcom-ipq8074-enable-the-GICv2m-support.patch
+++ b/target/linux/ipq807x/patches-5.15/0104-arm64-dts-qcom-ipq8074-enable-the-GICv2m-support.patch
@@ -11,11 +11,9 @@ Signed-off-by: Kathiravan T <quic_kathirav@quicinc.com>
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 9 +++++++++
  1 file changed, 9 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 452a81d288f4..777c6267e777 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -669,9 +669,18 @@ dwc_1: dwc3@8c00000 {
+@@ -669,9 +669,18 @@
  
  		intc: interrupt-controller@b000000 {
  			compatible = "qcom,msm-qgic2";
@@ -34,6 +32,3 @@ index 452a81d288f4..777c6267e777 100644
  		};
  
  		timer {
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0105-PCI-dwc-tegra-move-GEN3_RELATED-DBI-register-to-comm.patch b/target/linux/ipq807x/patches-5.15/0105-PCI-dwc-tegra-move-GEN3_RELATED-DBI-register-to-comm.patch
index 8655d60c8..0c6064549 100644
--- a/target/linux/ipq807x/patches-5.15/0105-PCI-dwc-tegra-move-GEN3_RELATED-DBI-register-to-comm.patch
+++ b/target/linux/ipq807x/patches-5.15/0105-PCI-dwc-tegra-move-GEN3_RELATED-DBI-register-to-comm.patch
@@ -13,8 +13,6 @@ Signed-off-by: Baruch Siach <baruch.siach@siklu.com>
  drivers/pci/controller/dwc/pcie-tegra194.c   | 6 ------
  2 files changed, 6 insertions(+), 6 deletions(-)
 
-diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h
-index 7d6e9b7576be..ea87809ee298 100644
 --- a/drivers/pci/controller/dwc/pcie-designware.h
 +++ b/drivers/pci/controller/dwc/pcie-designware.h
 @@ -74,6 +74,12 @@
@@ -30,8 +28,6 @@ index 7d6e9b7576be..ea87809ee298 100644
  #define PCIE_PORT_MULTI_LANE_CTRL	0x8C0
  #define PORT_MLTI_UPCFG_SUPPORT		BIT(7)
  
-diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
-index 904976913081..846c9d154f49 100644
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
 @@ -193,12 +193,6 @@
@@ -47,6 +43,3 @@ index 904976913081..846c9d154f49 100644
  #define PORT_LOGIC_AMBA_ERROR_RESPONSE_DEFAULT	0x8D0
  #define AMBA_ERROR_RESPONSE_CRS_SHIFT		3
  #define AMBA_ERROR_RESPONSE_CRS_MASK		GENMASK(1, 0)
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0106-PCI-qcom-Define-slot-capabilities-using-PCI_EXP_SLTC.patch b/target/linux/ipq807x/patches-5.15/0106-PCI-qcom-Define-slot-capabilities-using-PCI_EXP_SLTC.patch
index b158e65b3..5de9c87b6 100644
--- a/target/linux/ipq807x/patches-5.15/0106-PCI-qcom-Define-slot-capabilities-using-PCI_EXP_SLTC.patch
+++ b/target/linux/ipq807x/patches-5.15/0106-PCI-qcom-Define-slot-capabilities-using-PCI_EXP_SLTC.patch
@@ -12,8 +12,6 @@ Signed-off-by: Baruch Siach <baruch.siach@siklu.com>
  drivers/pci/controller/dwc/pcie-qcom.c | 15 +++++++++++++--
  1 file changed, 13 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
-index 8a7a300163e5..f5101258d73b 100644
 --- a/drivers/pci/controller/dwc/pcie-qcom.c
 +++ b/drivers/pci/controller/dwc/pcie-qcom.c
 @@ -69,7 +69,18 @@
@@ -36,7 +34,7 @@ index 8a7a300163e5..f5101258d73b 100644
  
  #define PCIE20_PARF_Q2A_FLUSH			0x1AC
  
-@@ -1102,7 +1113,7 @@ static int qcom_pcie_init_2_3_3(struct qcom_pcie *pcie)
+@@ -1125,7 +1136,7 @@ static int qcom_pcie_post_init_2_3_3(str
  
  	writel(PCI_COMMAND_MASTER, pci->dbi_base + PCI_COMMAND);
  	writel(DBI_RO_WR_EN, pci->dbi_base + PCIE20_MISC_CONTROL_1_REG);
@@ -45,6 +43,3 @@ index 8a7a300163e5..f5101258d73b 100644
  
  	val = readl(pci->dbi_base + offset + PCI_EXP_LNKCAP);
  	val &= ~PCI_EXP_LNKCAP_ASPMS;
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0107-PCI-qcom-Add-IPQ60xx-support.patch b/target/linux/ipq807x/patches-5.15/0107-PCI-qcom-Add-IPQ60xx-support.patch
index 501498a0a..d49d89e3d 100644
--- a/target/linux/ipq807x/patches-5.15/0107-PCI-qcom-Add-IPQ60xx-support.patch
+++ b/target/linux/ipq807x/patches-5.15/0107-PCI-qcom-Add-IPQ60xx-support.patch
@@ -21,8 +21,6 @@ Signed-off-by: Baruch Siach <baruch.siach@siklu.com>
  drivers/pci/controller/dwc/pcie-qcom.c       | 135 +++++++++++++++++++
  2 files changed, 136 insertions(+)
 
-diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h
-index ea87809ee298..279c3778a13b 100644
 --- a/drivers/pci/controller/dwc/pcie-designware.h
 +++ b/drivers/pci/controller/dwc/pcie-designware.h
 @@ -76,6 +76,7 @@
@@ -33,8 +31,6 @@ index ea87809ee298..279c3778a13b 100644
  #define GEN3_RELATED_OFF_GEN3_EQ_DISABLE	BIT(16)
  #define GEN3_RELATED_OFF_RATE_SHADOW_SEL_SHIFT	24
  #define GEN3_RELATED_OFF_RATE_SHADOW_SEL_MASK	GENMASK(25, 24)
-diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
-index f5101258d73b..05359cfc0e34 100644
 --- a/drivers/pci/controller/dwc/pcie-qcom.c
 +++ b/drivers/pci/controller/dwc/pcie-qcom.c
 @@ -52,6 +52,10 @@
@@ -68,7 +64,7 @@ index f5101258d73b..05359cfc0e34 100644
  };
  
  struct qcom_pcie;
-@@ -1277,6 +1287,121 @@ static void qcom_pcie_post_deinit_2_7_0(struct qcom_pcie *pcie)
+@@ -1276,6 +1286,121 @@ static void qcom_pcie_post_deinit_2_7_0(
  	clk_disable_unprepare(res->pipe_clk);
  }
  
@@ -190,7 +186,7 @@ index f5101258d73b..05359cfc0e34 100644
  static int qcom_pcie_link_up(struct dw_pcie *pci)
  {
  	u16 offset = dw_pcie_find_capability(pci, PCI_CAP_ID_EXP);
-@@ -1467,6 +1592,15 @@ static const struct qcom_pcie_ops ops_1_9_0 = {
+@@ -1467,6 +1592,15 @@ static const struct qcom_pcie_ops ops_1_
  	.config_sid = qcom_pcie_config_sid_sm8250,
  };
  
@@ -206,7 +202,7 @@ index f5101258d73b..05359cfc0e34 100644
  static const struct dw_pcie_ops dw_pcie_ops = {
  	.link_up = qcom_pcie_link_up,
  	.start_link = qcom_pcie_start_link,
-@@ -1566,6 +1700,7 @@ static const struct of_device_id qcom_pcie_match[] = {
+@@ -1565,6 +1699,7 @@ static const struct of_device_id qcom_pc
  	{ .compatible = "qcom,pcie-qcs404", .data = &ops_2_4_0 },
  	{ .compatible = "qcom,pcie-sdm845", .data = &ops_2_7_0 },
  	{ .compatible = "qcom,pcie-sm8250", .data = &ops_1_9_0 },
@@ -214,6 +210,3 @@ index f5101258d73b..05359cfc0e34 100644
  	{ }
  };
  
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0108-PCI-qcom-add-IPQ8074-Gen3-support.patch b/target/linux/ipq807x/patches-5.15/0108-PCI-qcom-add-IPQ8074-Gen3-support.patch
index 0112eef31..12b9b843e 100644
--- a/target/linux/ipq807x/patches-5.15/0108-PCI-qcom-add-IPQ8074-Gen3-support.patch
+++ b/target/linux/ipq807x/patches-5.15/0108-PCI-qcom-add-IPQ8074-Gen3-support.patch
@@ -11,8 +11,6 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  drivers/pci/controller/dwc/pcie-qcom.c | 9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
-index 05359cfc0e34..5556859eed18 100644
 --- a/drivers/pci/controller/dwc/pcie-qcom.c
 +++ b/drivers/pci/controller/dwc/pcie-qcom.c
 @@ -184,7 +184,7 @@ struct qcom_pcie_resources_2_7_0 {
@@ -24,7 +22,7 @@ index 05359cfc0e34..5556859eed18 100644
  	struct reset_control *rst;
  };
  
-@@ -1297,8 +1297,10 @@ static int qcom_pcie_get_resources_2_9_0(struct qcom_pcie *pcie)
+@@ -1296,8 +1296,10 @@ static int qcom_pcie_get_resources_2_9_0
  	res->clks[0].id = "iface";
  	res->clks[1].id = "axi_m";
  	res->clks[2].id = "axi_s";
@@ -37,7 +35,7 @@ index 05359cfc0e34..5556859eed18 100644
  
  	ret = devm_clk_bulk_get(dev, ARRAY_SIZE(res->clks), res->clks);
  	if (ret < 0)
-@@ -1701,6 +1703,7 @@ static const struct of_device_id qcom_pcie_match[] = {
+@@ -1700,6 +1702,7 @@ static const struct of_device_id qcom_pc
  	{ .compatible = "qcom,pcie-sdm845", .data = &ops_2_7_0 },
  	{ .compatible = "qcom,pcie-sm8250", .data = &ops_1_9_0 },
  	{ .compatible = "qcom,pcie-ipq6018", .data = &ops_2_9_0 },
@@ -45,6 +43,3 @@ index 05359cfc0e34..5556859eed18 100644
  	{ }
  };
  
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0110-arm64-dts-ipq8074-fix-PCI-related-DT-nodes.patch b/target/linux/ipq807x/patches-5.15/0110-arm64-dts-ipq8074-fix-PCI-related-DT-nodes.patch
index 392838149..b79f1bd7a 100644
--- a/target/linux/ipq807x/patches-5.15/0110-arm64-dts-ipq8074-fix-PCI-related-DT-nodes.patch
+++ b/target/linux/ipq807x/patches-5.15/0110-arm64-dts-ipq8074-fix-PCI-related-DT-nodes.patch
@@ -14,11 +14,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 73 +++++++++++++++------------
  1 file changed, 42 insertions(+), 31 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 777c6267e777..2f553b82ca12 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -228,9 +228,9 @@ qusb_phy_0: phy@79000 {
+@@ -228,9 +228,9 @@
  			status = "disabled";
  		};
  
@@ -31,7 +29,7 @@ index 777c6267e777..2f553b82ca12 100644
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges;
-@@ -244,21 +244,22 @@ pcie_qmp0: phy@86000 {
+@@ -244,21 +244,22 @@
  				      "common";
  			status = "disabled";
  
@@ -59,7 +57,7 @@ index 777c6267e777..2f553b82ca12 100644
  			#address-cells = <1>;
  			#size-cells = <1>;
  			ranges;
-@@ -273,14 +274,15 @@ pcie_qmp1: phy@8e000 {
+@@ -273,14 +274,15 @@
  			status = "disabled";
  
  			pcie_phy1: phy@8e200 {
@@ -77,7 +75,7 @@ index 777c6267e777..2f553b82ca12 100644
  			};
  		};
  
-@@ -676,7 +678,7 @@ intc: interrupt-controller@b000000 {
+@@ -676,7 +678,7 @@
  			reg = <0x0b000000 0x1000>, <0x0b002000 0x1000>;
  			ranges = <0 0xb00a000 0xffd>;
  
@@ -86,7 +84,7 @@ index 777c6267e777..2f553b82ca12 100644
  				compatible = "arm,gic-v2m-frame";
  				msi-controller;
  				reg = <0x0 0xffd>;
-@@ -769,6 +771,7 @@ pcie1: pci@10000000 {
+@@ -769,6 +771,7 @@
  			linux,pci-domain = <1>;
  			bus-range = <0x00 0xff>;
  			num-lanes = <1>;
@@ -94,7 +92,7 @@ index 777c6267e777..2f553b82ca12 100644
  			#address-cells = <3>;
  			#size-cells = <2>;
  
-@@ -776,12 +779,12 @@ pcie1: pci@10000000 {
+@@ -776,12 +779,12 @@
  			phy-names = "pciephy";
  
  			ranges = <0x81000000 0 0x10200000 0x10200000
@@ -112,7 +110,7 @@ index 777c6267e777..2f553b82ca12 100644
  			#interrupt-cells = <1>;
  			interrupt-map-mask = <0 0 0 0x7>;
  			interrupt-map = <0 0 0 1 &intc 0 142
-@@ -821,16 +824,18 @@ IRQ_TYPE_LEVEL_HIGH>, /* int_c */
+@@ -821,16 +824,18 @@
  		};
  
  		pcie0: pci@20000000 {
@@ -137,7 +135,7 @@ index 777c6267e777..2f553b82ca12 100644
  			#address-cells = <3>;
  			#size-cells = <2>;
  
-@@ -838,12 +843,12 @@ pcie0: pci@20000000 {
+@@ -838,12 +843,12 @@
  			phy-names = "pciephy";
  
  			ranges = <0x81000000 0 0x20200000 0x20200000
@@ -155,7 +153,7 @@ index 777c6267e777..2f553b82ca12 100644
  			#interrupt-cells = <1>;
  			interrupt-map-mask = <0 0 0 0x7>;
  			interrupt-map = <0 0 0 1 &intc 0 75
-@@ -859,27 +864,33 @@ IRQ_TYPE_LEVEL_HIGH>, /* int_c */
+@@ -859,27 +864,33 @@
  				 <&gcc GCC_PCIE0_AXI_M_CLK>,
  				 <&gcc GCC_PCIE0_AXI_S_CLK>,
  				 <&gcc GCC_PCIE0_AHB_CLK>,
@@ -193,6 +191,3 @@ index 777c6267e777..2f553b82ca12 100644
  			status = "disabled";
  		};
  	};
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0111-remoteproc-qcom-Add-PRNG-proxy-clock.patch b/target/linux/ipq807x/patches-5.15/0111-remoteproc-qcom-Add-PRNG-proxy-clock.patch
index 0e9157c99..f26651682 100644
--- a/target/linux/ipq807x/patches-5.15/0111-remoteproc-qcom-Add-PRNG-proxy-clock.patch
+++ b/target/linux/ipq807x/patches-5.15/0111-remoteproc-qcom-Add-PRNG-proxy-clock.patch
@@ -13,8 +13,6 @@ Signed-off-by: Nikhil Prakash V <nprakash@codeaurora.org>
  drivers/remoteproc/qcom_q6v5_wcss.c | 65 +++++++++++++++++++++--------
  1 file changed, 47 insertions(+), 18 deletions(-)
 
-diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
-index 20d50ec7eff1..0e5484020296 100644
 --- a/drivers/remoteproc/qcom_q6v5_wcss.c
 +++ b/drivers/remoteproc/qcom_q6v5_wcss.c
 @@ -91,19 +91,6 @@ enum {
@@ -67,7 +65,7 @@ index 20d50ec7eff1..0e5484020296 100644
  static int q6v5_wcss_reset(struct q6v5_wcss *wcss)
  {
  	int ret;
-@@ -240,6 +243,12 @@ static int q6v5_wcss_start(struct rproc *rproc)
+@@ -240,6 +243,12 @@ static int q6v5_wcss_start(struct rproc
  	struct q6v5_wcss *wcss = rproc->priv;
  	int ret;
  
@@ -80,7 +78,7 @@ index 20d50ec7eff1..0e5484020296 100644
  	qcom_q6v5_prepare(&wcss->q6v5);
  
  	/* Release Q6 and WCSS reset */
-@@ -732,6 +741,7 @@ static int q6v5_wcss_stop(struct rproc *rproc)
+@@ -732,6 +741,7 @@ static int q6v5_wcss_stop(struct rproc *
  			return ret;
  	}
  
@@ -88,7 +86,7 @@ index 20d50ec7eff1..0e5484020296 100644
  	qcom_q6v5_unprepare(&wcss->q6v5);
  
  	return 0;
-@@ -896,7 +906,21 @@ static int q6v5_alloc_memory_region(struct q6v5_wcss *wcss)
+@@ -896,7 +906,21 @@ static int q6v5_alloc_memory_region(stru
  	return 0;
  }
  
@@ -111,7 +109,7 @@ index 20d50ec7eff1..0e5484020296 100644
  {
  	int ret;
  
-@@ -986,7 +1010,7 @@ static int q6v5_wcss_init_clock(struct q6v5_wcss *wcss)
+@@ -986,7 +1010,7 @@ static int q6v5_wcss_init_clock(struct q
  	return 0;
  }
  
@@ -120,7 +118,7 @@ index 20d50ec7eff1..0e5484020296 100644
  {
  	wcss->cx_supply = devm_regulator_get(wcss->dev, "cx");
  	if (IS_ERR(wcss->cx_supply))
-@@ -1030,12 +1054,14 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
+@@ -1030,12 +1054,14 @@ static int q6v5_wcss_probe(struct platfo
  	if (ret)
  		goto free_rproc;
  
@@ -138,7 +136,7 @@ index 20d50ec7eff1..0e5484020296 100644
  		if (ret)
  			goto free_rproc;
  	}
-@@ -1082,6 +1108,7 @@ static int q6v5_wcss_remove(struct platform_device *pdev)
+@@ -1082,6 +1108,7 @@ static int q6v5_wcss_remove(struct platf
  }
  
  static const struct wcss_data wcss_ipq8074_res_init = {
@@ -146,7 +144,7 @@ index 20d50ec7eff1..0e5484020296 100644
  	.firmware_name = "IPQ8074/q6_fw.mdt",
  	.crash_reason_smem = WCSS_CRASH_REASON,
  	.aon_reset_required = true,
-@@ -1091,6 +1118,8 @@ static const struct wcss_data wcss_ipq8074_res_init = {
+@@ -1091,6 +1118,8 @@ static const struct wcss_data wcss_ipq80
  };
  
  static const struct wcss_data wcss_qcs404_res_init = {
@@ -155,6 +153,3 @@ index 20d50ec7eff1..0e5484020296 100644
  	.crash_reason_smem = WCSS_CRASH_REASON,
  	.firmware_name = "wcnss.mdt",
  	.version = WCSS_QCS404,
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0112-remoteproc-qcom-Add-secure-PIL-support.patch b/target/linux/ipq807x/patches-5.15/0112-remoteproc-qcom-Add-secure-PIL-support.patch
index d3165de82..cb675f59b 100644
--- a/target/linux/ipq807x/patches-5.15/0112-remoteproc-qcom-Add-secure-PIL-support.patch
+++ b/target/linux/ipq807x/patches-5.15/0112-remoteproc-qcom-Add-secure-PIL-support.patch
@@ -12,8 +12,6 @@ Signed-off-by: Nikhil Prakash V <nprakash@codeaurora.org>
  drivers/remoteproc/qcom_q6v5_wcss.c | 43 +++++++++++++++++++++++++++--
  1 file changed, 40 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
-index 0e5484020296..7d173b7816b8 100644
 --- a/drivers/remoteproc/qcom_q6v5_wcss.c
 +++ b/drivers/remoteproc/qcom_q6v5_wcss.c
 @@ -18,6 +18,7 @@
@@ -50,7 +48,7 @@ index 0e5484020296..7d173b7816b8 100644
  };
  
  static int q6v5_wcss_reset(struct q6v5_wcss *wcss)
-@@ -251,6 +257,15 @@ static int q6v5_wcss_start(struct rproc *rproc)
+@@ -251,6 +257,15 @@ static int q6v5_wcss_start(struct rproc
  
  	qcom_q6v5_prepare(&wcss->q6v5);
  
@@ -66,7 +64,7 @@ index 0e5484020296..7d173b7816b8 100644
  	/* Release Q6 and WCSS reset */
  	ret = reset_control_deassert(wcss->wcss_reset);
  	if (ret) {
-@@ -285,6 +300,7 @@ static int q6v5_wcss_start(struct rproc *rproc)
+@@ -285,6 +300,7 @@ static int q6v5_wcss_start(struct rproc
  	if (ret)
  		goto wcss_q6_reset;
  
@@ -74,7 +72,7 @@ index 0e5484020296..7d173b7816b8 100644
  	ret = qcom_q6v5_wait_for_start(&wcss->q6v5, 5 * HZ);
  	if (ret == -ETIMEDOUT)
  		dev_err(wcss->dev, "start timed out\n");
-@@ -717,6 +733,15 @@ static int q6v5_wcss_stop(struct rproc *rproc)
+@@ -717,6 +733,15 @@ static int q6v5_wcss_stop(struct rproc *
  	struct q6v5_wcss *wcss = rproc->priv;
  	int ret;
  
@@ -90,7 +88,7 @@ index 0e5484020296..7d173b7816b8 100644
  	/* WCSS powerdown */
  	if (wcss->requires_force_stop) {
  		ret = qcom_q6v5_request_stop(&wcss->q6v5, NULL);
-@@ -741,6 +766,7 @@ static int q6v5_wcss_stop(struct rproc *rproc)
+@@ -741,6 +766,7 @@ static int q6v5_wcss_stop(struct rproc *
  			return ret;
  	}
  
@@ -98,7 +96,7 @@ index 0e5484020296..7d173b7816b8 100644
  	clk_disable_unprepare(wcss->prng_clk);
  	qcom_q6v5_unprepare(&wcss->q6v5);
  
-@@ -764,9 +790,15 @@ static int q6v5_wcss_load(struct rproc *rproc, const struct firmware *fw)
+@@ -764,9 +790,15 @@ static int q6v5_wcss_load(struct rproc *
  	struct q6v5_wcss *wcss = rproc->priv;
  	int ret;
  
@@ -117,7 +115,7 @@ index 0e5484020296..7d173b7816b8 100644
  	if (ret)
  		return ret;
  
-@@ -1032,6 +1064,9 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
+@@ -1032,6 +1064,9 @@ static int q6v5_wcss_probe(struct platfo
  	if (!desc)
  		return -EINVAL;
  
@@ -127,7 +125,7 @@ index 0e5484020296..7d173b7816b8 100644
  	rproc = rproc_alloc(&pdev->dev, pdev->name, desc->ops,
  			    desc->firmware_name, sizeof(*wcss));
  	if (!rproc) {
-@@ -1045,6 +1080,7 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
+@@ -1045,6 +1080,7 @@ static int q6v5_wcss_probe(struct platfo
  
  	wcss->version = desc->version;
  	wcss->requires_force_stop = desc->requires_force_stop;
@@ -135,7 +133,7 @@ index 0e5484020296..7d173b7816b8 100644
  
  	ret = q6v5_wcss_init_mmio(wcss, pdev);
  	if (ret)
-@@ -1115,6 +1151,7 @@ static const struct wcss_data wcss_ipq8074_res_init = {
+@@ -1115,6 +1151,7 @@ static const struct wcss_data wcss_ipq80
  	.wcss_q6_reset_required = true,
  	.ops = &q6v5_wcss_ipq8074_ops,
  	.requires_force_stop = true,
@@ -143,6 +141,3 @@ index 0e5484020296..7d173b7816b8 100644
  };
  
  static const struct wcss_data wcss_qcs404_res_init = {
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0113-remoteproc-qcom-Add-support-for-split-q6-m3-wlan-fir.patch b/target/linux/ipq807x/patches-5.15/0113-remoteproc-qcom-Add-support-for-split-q6-m3-wlan-fir.patch
index 9bd59775d..2e0b45b7e 100644
--- a/target/linux/ipq807x/patches-5.15/0113-remoteproc-qcom-Add-support-for-split-q6-m3-wlan-fir.patch
+++ b/target/linux/ipq807x/patches-5.15/0113-remoteproc-qcom-Add-support-for-split-q6-m3-wlan-fir.patch
@@ -15,8 +15,6 @@ Signed-off-by: Nikhil Prakash V <nprakash@codeaurora.org>
  drivers/remoteproc/qcom_q6v5_wcss.c | 33 +++++++++++++++++++++++++----
  1 file changed, 29 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
-index 7d173b7816b8..60ed0c046693 100644
 --- a/drivers/remoteproc/qcom_q6v5_wcss.c
 +++ b/drivers/remoteproc/qcom_q6v5_wcss.c
 @@ -139,6 +139,7 @@ struct q6v5_wcss {
@@ -37,7 +35,7 @@ index 7d173b7816b8..60ed0c046693 100644
  	unsigned int crash_reason_smem;
  	u32 version;
  	bool aon_reset_required;
-@@ -788,8 +790,29 @@ static void *q6v5_wcss_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *i
+@@ -788,8 +790,29 @@ static void *q6v5_wcss_da_to_va(struct r
  static int q6v5_wcss_load(struct rproc *rproc, const struct firmware *fw)
  {
  	struct q6v5_wcss *wcss = rproc->priv;
@@ -67,7 +65,7 @@ index 7d173b7816b8..60ed0c046693 100644
  	if (wcss->need_mem_protection)
  		ret = qcom_mdt_load(wcss->dev, fw, rproc->firmware,
  				    WCNSS_PAS_ID, wcss->mem_region,
-@@ -1068,7 +1091,7 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
+@@ -1068,7 +1091,7 @@ static int q6v5_wcss_probe(struct platfo
  		return -EPROBE_DEFER;
  
  	rproc = rproc_alloc(&pdev->dev, pdev->name, desc->ops,
@@ -76,7 +74,7 @@ index 7d173b7816b8..60ed0c046693 100644
  	if (!rproc) {
  		dev_err(&pdev->dev, "failed to allocate rproc\n");
  		return -ENOMEM;
-@@ -1081,6 +1104,7 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
+@@ -1081,6 +1104,7 @@ static int q6v5_wcss_probe(struct platfo
  	wcss->version = desc->version;
  	wcss->requires_force_stop = desc->requires_force_stop;
  	wcss->need_mem_protection = desc->need_mem_protection;
@@ -84,7 +82,7 @@ index 7d173b7816b8..60ed0c046693 100644
  
  	ret = q6v5_wcss_init_mmio(wcss, pdev);
  	if (ret)
-@@ -1145,7 +1169,8 @@ static int q6v5_wcss_remove(struct platform_device *pdev)
+@@ -1145,7 +1169,8 @@ static int q6v5_wcss_remove(struct platf
  
  static const struct wcss_data wcss_ipq8074_res_init = {
  	.init_clock = ipq8074_init_clock,
@@ -94,7 +92,7 @@ index 7d173b7816b8..60ed0c046693 100644
  	.crash_reason_smem = WCSS_CRASH_REASON,
  	.aon_reset_required = true,
  	.wcss_q6_reset_required = true,
-@@ -1158,7 +1183,7 @@ static const struct wcss_data wcss_qcs404_res_init = {
+@@ -1158,7 +1183,7 @@ static const struct wcss_data wcss_qcs40
  	.init_clock = qcs404_init_clock,
  	.init_regulator = qcs404_init_regulator,
  	.crash_reason_smem = WCSS_CRASH_REASON,
@@ -103,6 +101,3 @@ index 7d173b7816b8..60ed0c046693 100644
  	.version = WCSS_QCS404,
  	.aon_reset_required = false,
  	.wcss_q6_reset_required = false,
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0114-remoteproc-qcom-Add-ssr-subdevice-identifier.patch b/target/linux/ipq807x/patches-5.15/0114-remoteproc-qcom-Add-ssr-subdevice-identifier.patch
index d52a0ff79..2ac54a73d 100644
--- a/target/linux/ipq807x/patches-5.15/0114-remoteproc-qcom-Add-ssr-subdevice-identifier.patch
+++ b/target/linux/ipq807x/patches-5.15/0114-remoteproc-qcom-Add-ssr-subdevice-identifier.patch
@@ -12,11 +12,9 @@ Signed-off-by: Nikhil Prakash V <nprakash@codeaurora.org>
  drivers/remoteproc/qcom_q6v5_wcss.c | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
-index 60ed0c046693..e32efdc660d2 100644
 --- a/drivers/remoteproc/qcom_q6v5_wcss.c
 +++ b/drivers/remoteproc/qcom_q6v5_wcss.c
-@@ -1174,6 +1174,7 @@ static const struct wcss_data wcss_ipq8074_res_init = {
+@@ -1174,6 +1174,7 @@ static const struct wcss_data wcss_ipq80
  	.crash_reason_smem = WCSS_CRASH_REASON,
  	.aon_reset_required = true,
  	.wcss_q6_reset_required = true,
@@ -24,6 +22,3 @@ index 60ed0c046693..e32efdc660d2 100644
  	.ops = &q6v5_wcss_ipq8074_ops,
  	.requires_force_stop = true,
  	.need_mem_protection = true,
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0115-remoteproc-qcom-Update-regmap-offsets-for-halt-regis.patch b/target/linux/ipq807x/patches-5.15/0115-remoteproc-qcom-Update-regmap-offsets-for-halt-regis.patch
index 54116c5e2..2c353238f 100644
--- a/target/linux/ipq807x/patches-5.15/0115-remoteproc-qcom-Update-regmap-offsets-for-halt-regis.patch
+++ b/target/linux/ipq807x/patches-5.15/0115-remoteproc-qcom-Update-regmap-offsets-for-halt-regis.patch
@@ -11,8 +11,6 @@ Signed-off-by: Sricharan R <sricharan@codeaurora.org>
  drivers/remoteproc/qcom_q6v5_wcss.c | 22 ++++++++++++++--------
  1 file changed, 14 insertions(+), 8 deletions(-)
 
-diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
-index e32efdc660d2..16fc5a33adaf 100644
 --- a/drivers/remoteproc/qcom_q6v5_wcss.c
 +++ b/drivers/remoteproc/qcom_q6v5_wcss.c
 @@ -86,7 +86,7 @@
@@ -32,7 +30,7 @@ index e32efdc660d2..16fc5a33adaf 100644
  	const char *ssr_name;
  	const char *sysmon_name;
  	int ssctl_id;
-@@ -874,10 +875,13 @@ static int q6v5_wcss_init_reset(struct q6v5_wcss *wcss,
+@@ -874,10 +875,13 @@ static int q6v5_wcss_init_reset(struct q
  		}
  	}
  
@@ -50,7 +48,7 @@ index e32efdc660d2..16fc5a33adaf 100644
  	}
  
  	return 0;
-@@ -925,9 +929,9 @@ static int q6v5_wcss_init_mmio(struct q6v5_wcss *wcss,
+@@ -925,9 +929,9 @@ static int q6v5_wcss_init_mmio(struct q6
  		return -EINVAL;
  	}
  
@@ -63,7 +61,7 @@ index e32efdc660d2..16fc5a33adaf 100644
  
  	return 0;
  }
-@@ -1174,6 +1178,7 @@ static const struct wcss_data wcss_ipq8074_res_init = {
+@@ -1174,6 +1178,7 @@ static const struct wcss_data wcss_ipq80
  	.crash_reason_smem = WCSS_CRASH_REASON,
  	.aon_reset_required = true,
  	.wcss_q6_reset_required = true,
@@ -71,7 +69,7 @@ index e32efdc660d2..16fc5a33adaf 100644
  	.ssr_name = "q6wcss",
  	.ops = &q6v5_wcss_ipq8074_ops,
  	.requires_force_stop = true,
-@@ -1188,6 +1193,7 @@ static const struct wcss_data wcss_qcs404_res_init = {
+@@ -1188,6 +1193,7 @@ static const struct wcss_data wcss_qcs40
  	.version = WCSS_QCS404,
  	.aon_reset_required = false,
  	.wcss_q6_reset_required = false,
@@ -79,6 +77,3 @@ index e32efdc660d2..16fc5a33adaf 100644
  	.ssr_name = "mpss",
  	.sysmon_name = "wcnss",
  	.ssctl_id = 0x12,
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0116-dt-bindings-clock-qcom-Add-reset-for-WCSSAON.patch b/target/linux/ipq807x/patches-5.15/0116-dt-bindings-clock-qcom-Add-reset-for-WCSSAON.patch
index 2f6c68b1d..8e1dbc033 100644
--- a/target/linux/ipq807x/patches-5.15/0116-dt-bindings-clock-qcom-Add-reset-for-WCSSAON.patch
+++ b/target/linux/ipq807x/patches-5.15/0116-dt-bindings-clock-qcom-Add-reset-for-WCSSAON.patch
@@ -14,8 +14,6 @@ Acked-by: Stephen Boyd <sboyd@kernel.org>
  include/dt-bindings/clock/qcom,gcc-ipq8074.h | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/include/dt-bindings/clock/qcom,gcc-ipq8074.h b/include/dt-bindings/clock/qcom,gcc-ipq8074.h
-index 8e2bec1c91bf..9b1c42bc430c 100644
 --- a/include/dt-bindings/clock/qcom,gcc-ipq8074.h
 +++ b/include/dt-bindings/clock/qcom,gcc-ipq8074.h
 @@ -366,5 +366,6 @@
@@ -25,6 +23,3 @@ index 8e2bec1c91bf..9b1c42bc430c 100644
 +#define GCC_WCSSAON_RESET			132
  
  #endif
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0117-clk-qcom-Add-WCSSAON-reset.patch b/target/linux/ipq807x/patches-5.15/0117-clk-qcom-Add-WCSSAON-reset.patch
index 026f780bc..200e410ed 100644
--- a/target/linux/ipq807x/patches-5.15/0117-clk-qcom-Add-WCSSAON-reset.patch
+++ b/target/linux/ipq807x/patches-5.15/0117-clk-qcom-Add-WCSSAON-reset.patch
@@ -13,11 +13,9 @@ Acked-by: Stephen Boyd <sboyd@kernel.org>
  drivers/clk/qcom/gcc-ipq8074.c | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/drivers/clk/qcom/gcc-ipq8074.c b/drivers/clk/qcom/gcc-ipq8074.c
-index b09d99343e09..4d6e8c47515f 100644
 --- a/drivers/clk/qcom/gcc-ipq8074.c
 +++ b/drivers/clk/qcom/gcc-ipq8074.c
-@@ -4744,6 +4744,7 @@ static const struct qcom_reset_map gcc_ipq8074_resets[] = {
+@@ -4790,6 +4790,7 @@ static const struct qcom_reset_map gcc_i
  	[GCC_PCIE1_AXI_SLAVE_ARES] = { 0x76040, 4 },
  	[GCC_PCIE1_AHB_ARES] = { 0x76040, 5 },
  	[GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 },
@@ -25,6 +23,3 @@ index b09d99343e09..4d6e8c47515f 100644
  };
  
  static const struct of_device_id gcc_ipq8074_match_table[] = {
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0118-remoteproc-wcss-disable-auto-boot-for-IPQ8074.patch b/target/linux/ipq807x/patches-5.15/0118-remoteproc-wcss-disable-auto-boot-for-IPQ8074.patch
index e7400c427..b6bb23914 100644
--- a/target/linux/ipq807x/patches-5.15/0118-remoteproc-wcss-disable-auto-boot-for-IPQ8074.patch
+++ b/target/linux/ipq807x/patches-5.15/0118-remoteproc-wcss-disable-auto-boot-for-IPQ8074.patch
@@ -11,8 +11,6 @@ Change-Id: Ia82edb7ee52f2bd010c099f151179d69a953ac88
  drivers/remoteproc/qcom_q6v5_wcss.c | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
-index 16fc5a33adaf..92c240976f55 100644
 --- a/drivers/remoteproc/qcom_q6v5_wcss.c
 +++ b/drivers/remoteproc/qcom_q6v5_wcss.c
 @@ -161,6 +161,7 @@ struct wcss_data {
@@ -23,7 +21,7 @@ index 16fc5a33adaf..92c240976f55 100644
  };
  
  static int q6v5_wcss_reset(struct q6v5_wcss *wcss)
-@@ -1147,6 +1148,7 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
+@@ -1147,6 +1148,7 @@ static int q6v5_wcss_probe(struct platfo
  						      desc->sysmon_name,
  						      desc->ssctl_id);
  
@@ -31,7 +29,7 @@ index 16fc5a33adaf..92c240976f55 100644
  	ret = rproc_add(rproc);
  	if (ret)
  		goto free_rproc;
-@@ -1183,6 +1185,7 @@ static const struct wcss_data wcss_ipq8074_res_init = {
+@@ -1183,6 +1185,7 @@ static const struct wcss_data wcss_ipq80
  	.ops = &q6v5_wcss_ipq8074_ops,
  	.requires_force_stop = true,
  	.need_mem_protection = true,
@@ -39,7 +37,7 @@ index 16fc5a33adaf..92c240976f55 100644
  };
  
  static const struct wcss_data wcss_qcs404_res_init = {
-@@ -1199,6 +1202,7 @@ static const struct wcss_data wcss_qcs404_res_init = {
+@@ -1199,6 +1202,7 @@ static const struct wcss_data wcss_qcs40
  	.ssctl_id = 0x12,
  	.ops = &q6v5_wcss_qcs404_ops,
  	.requires_force_stop = false,
@@ -47,6 +45,3 @@ index 16fc5a33adaf..92c240976f55 100644
  };
  
  static const struct of_device_id q6v5_wcss_of_match[] = {
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0119-arm64-dts-qcom-Enable-Q6v5-WCSS-for-ipq8074-SoC.patch b/target/linux/ipq807x/patches-5.15/0119-arm64-dts-qcom-Enable-Q6v5-WCSS-for-ipq8074-SoC.patch
index 3a19b0d27..15cbd86cb 100644
--- a/target/linux/ipq807x/patches-5.15/0119-arm64-dts-qcom-Enable-Q6v5-WCSS-for-ipq8074-SoC.patch
+++ b/target/linux/ipq807x/patches-5.15/0119-arm64-dts-qcom-Enable-Q6v5-WCSS-for-ipq8074-SoC.patch
@@ -14,11 +14,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 88 +++++++++++++++++++++++++++
  1 file changed, 88 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 2f553b82ca12..947064465fc0 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -136,6 +136,32 @@ scm {
+@@ -136,6 +136,32 @@
  		};
  	};
  
@@ -51,7 +49,7 @@ index 2f553b82ca12..947064465fc0 100644
  	soc: soc {
  		#address-cells = <0x1>;
  		#size-cells = <0x1>;
-@@ -393,6 +419,11 @@ tcsr_mutex: hwlock@1905000 {
+@@ -393,6 +419,11 @@
  			#hwlock-cells = <1>;
  		};
  
@@ -63,7 +61,7 @@ index 2f553b82ca12..947064465fc0 100644
  		spmi_bus: spmi@200f000 {
  			compatible = "qcom,spmi-pmic-arb";
  			reg = <0x0200f000 0x001000>,
-@@ -893,5 +924,62 @@ IRQ_TYPE_LEVEL_HIGH>, /* int_c */
+@@ -893,5 +924,62 @@
  				      "axi_s_sticky";
  			status = "disabled";
  		};
@@ -126,6 +124,3 @@ index 2f553b82ca12..947064465fc0 100644
 +		};
  	};
  };
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0120-arm64-dts-ipq8074-Add-WLAN-node.patch b/target/linux/ipq807x/patches-5.15/0120-arm64-dts-ipq8074-Add-WLAN-node.patch
index 42ebab26d..ca22d048b 100644
--- a/target/linux/ipq807x/patches-5.15/0120-arm64-dts-ipq8074-Add-WLAN-node.patch
+++ b/target/linux/ipq807x/patches-5.15/0120-arm64-dts-ipq8074-Add-WLAN-node.patch
@@ -13,11 +13,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 111 ++++++++++++++++++++++++++
  1 file changed, 111 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 947064465fc0..57daacff929c 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -981,5 +981,116 @@ rpm_requests {
+@@ -981,5 +981,116 @@
  				};
  			};
  		};
@@ -134,6 +132,3 @@ index 947064465fc0..57daacff929c 100644
 +		};
  	};
  };
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0121-thermal-qcom-tsens-Add-IPQ8074-support.patch b/target/linux/ipq807x/patches-5.15/0121-thermal-qcom-tsens-Add-IPQ8074-support.patch
index f6c4add0f..e55bc0bdb 100644
--- a/target/linux/ipq807x/patches-5.15/0121-thermal-qcom-tsens-Add-IPQ8074-support.patch
+++ b/target/linux/ipq807x/patches-5.15/0121-thermal-qcom-tsens-Add-IPQ8074-support.patch
@@ -13,11 +13,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  drivers/thermal/qcom/tsens.h    |  2 +-
  3 files changed, 33 insertions(+), 10 deletions(-)
 
-diff --git a/drivers/thermal/qcom/tsens-v2.c b/drivers/thermal/qcom/tsens-v2.c
-index b293ed32174b..d9e70d8e0e3b 100644
 --- a/drivers/thermal/qcom/tsens-v2.c
 +++ b/drivers/thermal/qcom/tsens-v2.c
-@@ -36,6 +36,14 @@ static struct tsens_features tsens_v2_feat = {
+@@ -36,6 +36,14 @@ static struct tsens_features tsens_v2_fe
  	.max_sensors	= 16,
  };
  
@@ -45,11 +43,9 @@ index b293ed32174b..d9e70d8e0e3b 100644
  /* Kept around for backward compatibility with old msm8996.dtsi */
  struct tsens_plat_data data_8996 = {
  	.num_sensors	= 13,
-diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
-index 99a8d9f3e03c..b828befafa8e 100644
 --- a/drivers/thermal/qcom/tsens.c
 +++ b/drivers/thermal/qcom/tsens.c
-@@ -325,16 +325,22 @@ static int tsens_read_irq_state(struct tsens_priv *priv, u32 hw_id,
+@@ -325,16 +325,22 @@ static int tsens_read_irq_state(struct t
  		ret = regmap_field_read(priv->rf[LOW_INT_MASK_0 + hw_id], &d->low_irq_mask);
  		if (ret)
  			return ret;
@@ -81,7 +77,7 @@ index 99a8d9f3e03c..b828befafa8e 100644
  	} else {
  		/* No mask register on older TSENS */
  		d->up_irq_mask = 0;
-@@ -993,6 +999,9 @@ static const struct of_device_id tsens_table[] = {
+@@ -993,6 +999,9 @@ static const struct of_device_id tsens_t
  	}, {
  		.compatible = "qcom,tsens-v2",
  		.data = &data_tsens_v2,
@@ -91,11 +87,9 @@ index 99a8d9f3e03c..b828befafa8e 100644
  	},
  	{}
  };
-diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
-index 1471a2c00f15..00a1c897e721 100644
 --- a/drivers/thermal/qcom/tsens.h
 +++ b/drivers/thermal/qcom/tsens.h
-@@ -593,6 +593,6 @@ extern struct tsens_plat_data data_8916, data_8939, data_8974, data_9607;
+@@ -593,6 +593,6 @@ extern struct tsens_plat_data data_8916,
  extern struct tsens_plat_data data_tsens_v1, data_8976;
  
  /* TSENS v2 targets */
@@ -103,6 +97,3 @@ index 1471a2c00f15..00a1c897e721 100644
 +extern struct tsens_plat_data data_8996, data_tsens_v2, data_tsens_ipq8074;
  
  #endif /* __QCOM_TSENS_H__ */
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0122-arm64-dts-ipq8074-add-thermal-nodes.patch b/target/linux/ipq807x/patches-5.15/0122-arm64-dts-ipq8074-add-thermal-nodes.patch
index cff9460ad..bd991c08b 100644
--- a/target/linux/ipq807x/patches-5.15/0122-arm64-dts-ipq8074-add-thermal-nodes.patch
+++ b/target/linux/ipq807x/patches-5.15/0122-arm64-dts-ipq8074-add-thermal-nodes.patch
@@ -16,11 +16,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 96 +++++++++++++++++++++++++++
  1 file changed, 96 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 57daacff929c..f5c5778f8ab9 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -332,6 +332,16 @@ prng: rng@e3000 {
+@@ -332,6 +332,16 @@
  			status = "disabled";
  		};
  
@@ -37,7 +35,7 @@ index 57daacff929c..f5c5778f8ab9 100644
  		cryptobam: dma@704000 {
  			compatible = "qcom,bam-v1.7.0";
  			reg = <0x00704000 0x20000>;
-@@ -1093,4 +1103,90 @@ wifi: wifi@c0000000 {
+@@ -1093,4 +1103,90 @@
  			status = "disabled";
  		};
  	};
@@ -128,6 +126,3 @@ index 57daacff929c..f5c5778f8ab9 100644
 +		};
 +	};
  };
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0123-regulator-qcom_spmi-Add-PMD9655-SPMI-regulator.patch b/target/linux/ipq807x/patches-5.15/0123-regulator-qcom_spmi-Add-PMD9655-SPMI-regulator.patch
index 11c30788f..5093054c2 100644
--- a/target/linux/ipq807x/patches-5.15/0123-regulator-qcom_spmi-Add-PMD9655-SPMI-regulator.patch
+++ b/target/linux/ipq807x/patches-5.15/0123-regulator-qcom_spmi-Add-PMD9655-SPMI-regulator.patch
@@ -12,11 +12,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  drivers/regulator/qcom_spmi-regulator.c | 8 ++++++++
  1 file changed, 8 insertions(+)
 
-diff --git a/drivers/regulator/qcom_spmi-regulator.c b/drivers/regulator/qcom_spmi-regulator.c
-index 41424a3366d0..fbb5eeb3f802 100644
 --- a/drivers/regulator/qcom_spmi-regulator.c
 +++ b/drivers/regulator/qcom_spmi-regulator.c
-@@ -2092,6 +2092,13 @@ static const struct spmi_regulator_data pms405_regulators[] = {
+@@ -2092,6 +2092,13 @@ static const struct spmi_regulator_data
  	{ }
  };
  
@@ -30,7 +28,7 @@ index 41424a3366d0..fbb5eeb3f802 100644
  static const struct of_device_id qcom_spmi_regulator_match[] = {
  	{ .compatible = "qcom,pm8004-regulators", .data = &pm8004_regulators },
  	{ .compatible = "qcom,pm8005-regulators", .data = &pm8005_regulators },
-@@ -2104,6 +2111,7 @@ static const struct of_device_id qcom_spmi_regulator_match[] = {
+@@ -2104,6 +2111,7 @@ static const struct of_device_id qcom_sp
  	{ .compatible = "qcom,pm660-regulators", .data = &pm660_regulators },
  	{ .compatible = "qcom,pm660l-regulators", .data = &pm660l_regulators },
  	{ .compatible = "qcom,pms405-regulators", .data = &pms405_regulators },
@@ -38,6 +36,3 @@ index 41424a3366d0..fbb5eeb3f802 100644
  	{ }
  };
  MODULE_DEVICE_TABLE(of, qcom_spmi_regulator_match);
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0124-regulator-qcom_spmi-SMPS-range-is-added-to-support-P.patch b/target/linux/ipq807x/patches-5.15/0124-regulator-qcom_spmi-SMPS-range-is-added-to-support-P.patch
index c70b1d03b..1b8a5c429 100644
--- a/target/linux/ipq807x/patches-5.15/0124-regulator-qcom_spmi-SMPS-range-is-added-to-support-P.patch
+++ b/target/linux/ipq807x/patches-5.15/0124-regulator-qcom_spmi-SMPS-range-is-added-to-support-P.patch
@@ -10,11 +10,9 @@ Change-Id: I5571801debec25527fd763d95aff27cc42f53bde
  drivers/regulator/qcom_spmi-regulator.c | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/drivers/regulator/qcom_spmi-regulator.c b/drivers/regulator/qcom_spmi-regulator.c
-index fbb5eeb3f802..bb10a325e5e7 100644
 --- a/drivers/regulator/qcom_spmi-regulator.c
 +++ b/drivers/regulator/qcom_spmi-regulator.c
-@@ -481,6 +481,7 @@ static struct spmi_voltage_range ln_ldo_ranges[] = {
+@@ -481,6 +481,7 @@ static struct spmi_voltage_range ln_ldo_
  };
  
  static struct spmi_voltage_range smps_ranges[] = {
@@ -22,6 +20,3 @@ index fbb5eeb3f802..bb10a325e5e7 100644
  	SPMI_VOLTAGE_RANGE(0,  375000,  375000, 1562500, 1562500, 12500),
  	SPMI_VOLTAGE_RANGE(1, 1550000, 1575000, 3125000, 3125000, 25000),
  };
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0125-regulator-qcom_spmi-Initialize-slew-rate-only-if-req.patch b/target/linux/ipq807x/patches-5.15/0125-regulator-qcom_spmi-Initialize-slew-rate-only-if-req.patch
index e35c391a4..9fd7dc432 100644
--- a/target/linux/ipq807x/patches-5.15/0125-regulator-qcom_spmi-Initialize-slew-rate-only-if-req.patch
+++ b/target/linux/ipq807x/patches-5.15/0125-regulator-qcom_spmi-Initialize-slew-rate-only-if-req.patch
@@ -16,11 +16,9 @@ Change-Id: Ida3cf3d754e1207e34a164d6d86c6e1aa109ef1e
  drivers/regulator/qcom_spmi-regulator.c | 7 +++++++
  1 file changed, 7 insertions(+)
 
-diff --git a/drivers/regulator/qcom_spmi-regulator.c b/drivers/regulator/qcom_spmi-regulator.c
-index bb10a325e5e7..d9fef082a34e 100644
 --- a/drivers/regulator/qcom_spmi-regulator.c
 +++ b/drivers/regulator/qcom_spmi-regulator.c
-@@ -1617,6 +1617,13 @@ static int spmi_regulator_init_slew_rate(struct spmi_regulator *vreg)
+@@ -1617,6 +1617,13 @@ static int spmi_regulator_init_slew_rate
  	int step, delay, slew_rate, step_delay;
  	const struct spmi_voltage_range *range;
  
@@ -34,6 +32,3 @@ index bb10a325e5e7..d9fef082a34e 100644
  	ret = spmi_vreg_read(vreg, SPMI_COMMON_REG_STEP_CTRL, &reg, 1);
  	if (ret) {
  		dev_err(vreg->dev, "spmi read failed, ret=%d\n", ret);
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0126-regulator-qcom_spmi-Add-support-for-VMPWM_CTL-subtyp.patch b/target/linux/ipq807x/patches-5.15/0126-regulator-qcom_spmi-Add-support-for-VMPWM_CTL-subtyp.patch
index 75729c3f7..9a15cb7ba 100644
--- a/target/linux/ipq807x/patches-5.15/0126-regulator-qcom_spmi-Add-support-for-VMPWM_CTL-subtyp.patch
+++ b/target/linux/ipq807x/patches-5.15/0126-regulator-qcom_spmi-Add-support-for-VMPWM_CTL-subtyp.patch
@@ -17,8 +17,6 @@ Change-Id: Id7a3caef84499b9e2eefda9f57576923c84234f0
  drivers/regulator/qcom_spmi-regulator.c | 82 +++++++++++++++++++++++++
  1 file changed, 82 insertions(+)
 
-diff --git a/drivers/regulator/qcom_spmi-regulator.c b/drivers/regulator/qcom_spmi-regulator.c
-index d9fef082a34e..6176a09df345 100644
 --- a/drivers/regulator/qcom_spmi-regulator.c
 +++ b/drivers/regulator/qcom_spmi-regulator.c
 @@ -164,6 +164,7 @@ enum spmi_regulator_subtype {
@@ -29,7 +27,7 @@ index d9fef082a34e..6176a09df345 100644
  };
  
  enum spmi_common_regulator_registers {
-@@ -289,6 +290,10 @@ enum spmi_common_control_register_index {
+@@ -289,6 +290,10 @@ enum spmi_common_control_register_index
  #define SPMI_FTSMPS_STEP_CTRL_DELAY_MASK	0x07
  #define SPMI_FTSMPS_STEP_CTRL_DELAY_SHIFT	0
  
@@ -40,7 +38,7 @@ index d9fef082a34e..6176a09df345 100644
  /* Clock rate in kHz of the FTSMPS regulator reference clock. */
  #define SPMI_FTSMPS_CLOCK_RATE		19200
  
-@@ -486,6 +491,10 @@ static struct spmi_voltage_range smps_ranges[] = {
+@@ -486,6 +491,10 @@ static struct spmi_voltage_range smps_ra
  	SPMI_VOLTAGE_RANGE(1, 1550000, 1575000, 3125000, 3125000, 25000),
  };
  
@@ -59,7 +57,7 @@ index d9fef082a34e..6176a09df345 100644
  static DEFINE_SPMI_SET_POINTS(ftsmps);
  static DEFINE_SPMI_SET_POINTS(ftsmps2p5);
  static DEFINE_SPMI_SET_POINTS(ftsmps426);
-@@ -745,6 +755,24 @@ spmi_regulator_find_range(struct spmi_regulator *vreg)
+@@ -745,6 +755,24 @@ spmi_regulator_find_range(struct spmi_re
  	return NULL;
  }
  
@@ -84,7 +82,7 @@ index d9fef082a34e..6176a09df345 100644
  static int spmi_regulator_select_voltage_same_range(struct spmi_regulator *vreg,
  		int min_uV, int max_uV)
  {
-@@ -966,6 +994,47 @@ static int spmi_regulator_ult_lo_smps_get_voltage(struct regulator_dev *rdev)
+@@ -966,6 +994,47 @@ static int spmi_regulator_ult_lo_smps_ge
  	return spmi_hw_selector_to_sw(vreg, voltage_sel, range);
  }
  
@@ -132,7 +130,7 @@ index d9fef082a34e..6176a09df345 100644
  static int spmi_regulator_common_list_voltage(struct regulator_dev *rdev,
  			unsigned selector)
  {
-@@ -1314,6 +1383,18 @@ static const struct regulator_ops spmi_smps_ops = {
+@@ -1314,6 +1383,18 @@ static const struct regulator_ops spmi_s
  	.set_pull_down		= spmi_regulator_common_set_pull_down,
  };
  
@@ -151,7 +149,7 @@ index d9fef082a34e..6176a09df345 100644
  static const struct regulator_ops spmi_ldo_ops = {
  	.enable			= regulator_enable_regmap,
  	.disable		= regulator_disable_regmap,
-@@ -1459,6 +1540,7 @@ static const struct regulator_ops spmi_hfs430_ops = {
+@@ -1459,6 +1540,7 @@ static const struct regulator_ops spmi_h
  
  static const struct spmi_regulator_mapping supported_regulators[] = {
  	/*           type subtype dig_min dig_max ltype ops setpoints hpm_min */
@@ -159,6 +157,3 @@ index d9fef082a34e..6176a09df345 100644
  	SPMI_VREG(BUCK,  GP_CTL,   0, INF, SMPS,   smps,   smps,   100000),
  	SPMI_VREG(BUCK,  HFS430,   0, INF, HFS430, hfs430, hfs430,  10000),
  	SPMI_VREG(LDO,   N300,     0, INF, LDO,    ldo,    nldo1,   10000),
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0127-ipq807x-sdhc-Fixed-SDR104-mode-card-detection.patch b/target/linux/ipq807x/patches-5.15/0127-ipq807x-sdhc-Fixed-SDR104-mode-card-detection.patch
index 55e523c99..65a0c6c83 100644
--- a/target/linux/ipq807x/patches-5.15/0127-ipq807x-sdhc-Fixed-SDR104-mode-card-detection.patch
+++ b/target/linux/ipq807x/patches-5.15/0127-ipq807x-sdhc-Fixed-SDR104-mode-card-detection.patch
@@ -14,8 +14,6 @@ Change-Id: Ie5edb7b3d972e06f3eb2525e10597b49e9bae14d
  drivers/regulator/qcom_spmi-regulator.c | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/drivers/regulator/qcom_spmi-regulator.c b/drivers/regulator/qcom_spmi-regulator.c
-index 6176a09df345..1cdf2117a2fe 100644
 --- a/drivers/regulator/qcom_spmi-regulator.c
 +++ b/drivers/regulator/qcom_spmi-regulator.c
 @@ -165,6 +165,7 @@ enum spmi_regulator_subtype {
@@ -26,7 +24,7 @@ index 6176a09df345..1cdf2117a2fe 100644
  };
  
  enum spmi_common_regulator_registers {
-@@ -493,6 +494,7 @@ static struct spmi_voltage_range smps_ranges[] = {
+@@ -493,6 +494,7 @@ static struct spmi_voltage_range smps_ra
  
  static struct spmi_voltage_range smps_vmpwm_ranges[] = {
  	SPMI_VOLTAGE_RANGE(0,  664000,  664000, 1104000, 1104000, 8000),
@@ -34,7 +32,7 @@ index 6176a09df345..1cdf2117a2fe 100644
  };
  
  static struct spmi_voltage_range ftsmps_ranges[] = {
-@@ -1540,6 +1542,7 @@ static const struct regulator_ops spmi_hfs430_ops = {
+@@ -1540,6 +1542,7 @@ static const struct regulator_ops spmi_h
  
  static const struct spmi_regulator_mapping supported_regulators[] = {
  	/*           type subtype dig_min dig_max ltype ops setpoints hpm_min */
@@ -42,6 +40,3 @@ index 6176a09df345..1cdf2117a2fe 100644
  	SPMI_VREG(BUCK,  VMPWM_CTL, 0, INF, SMPS, smps_vmpwm, smps_vmpwm, 0),
  	SPMI_VREG(BUCK,  GP_CTL,   0, INF, SMPS,   smps,   smps,   100000),
  	SPMI_VREG(BUCK,  HFS430,   0, INF, HFS430, hfs430, hfs430,  10000),
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0128-ipq807x-spmi-regulator-Add-separate-voltage-range-fo.patch b/target/linux/ipq807x/patches-5.15/0128-ipq807x-spmi-regulator-Add-separate-voltage-range-fo.patch
index 95e9a79a2..ef37bbeee 100644
--- a/target/linux/ipq807x/patches-5.15/0128-ipq807x-spmi-regulator-Add-separate-voltage-range-fo.patch
+++ b/target/linux/ipq807x/patches-5.15/0128-ipq807x-spmi-regulator-Add-separate-voltage-range-fo.patch
@@ -15,11 +15,9 @@ Change-Id: I883518ae0686762a3774750b1dd480c4fe7298f3
  drivers/regulator/qcom_spmi-regulator.c | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/regulator/qcom_spmi-regulator.c b/drivers/regulator/qcom_spmi-regulator.c
-index 1cdf2117a2fe..ca5f28225b1c 100644
 --- a/drivers/regulator/qcom_spmi-regulator.c
 +++ b/drivers/regulator/qcom_spmi-regulator.c
-@@ -494,7 +494,10 @@ static struct spmi_voltage_range smps_ranges[] = {
+@@ -494,7 +494,10 @@ static struct spmi_voltage_range smps_ra
  
  static struct spmi_voltage_range smps_vmpwm_ranges[] = {
  	SPMI_VOLTAGE_RANGE(0,  664000,  664000, 1104000, 1104000, 8000),
@@ -39,7 +37,7 @@ index 1cdf2117a2fe..ca5f28225b1c 100644
  static DEFINE_SPMI_SET_POINTS(ftsmps);
  static DEFINE_SPMI_SET_POINTS(ftsmps2p5);
  static DEFINE_SPMI_SET_POINTS(ftsmps426);
-@@ -1542,7 +1546,7 @@ static const struct regulator_ops spmi_hfs430_ops = {
+@@ -1542,7 +1546,7 @@ static const struct regulator_ops spmi_h
  
  static const struct spmi_regulator_mapping supported_regulators[] = {
  	/*           type subtype dig_min dig_max ltype ops setpoints hpm_min */
@@ -48,6 +46,3 @@ index 1cdf2117a2fe..ca5f28225b1c 100644
  	SPMI_VREG(BUCK,  VMPWM_CTL, 0, INF, SMPS, smps_vmpwm, smps_vmpwm, 0),
  	SPMI_VREG(BUCK,  GP_CTL,   0, INF, SMPS,   smps,   smps,   100000),
  	SPMI_VREG(BUCK,  HFS430,   0, INF, HFS430, hfs430, hfs430,  10000),
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0129-arm64-dts-ipq8074-add-SPMI-PMIC-regulators.patch b/target/linux/ipq807x/patches-5.15/0129-arm64-dts-ipq8074-add-SPMI-PMIC-regulators.patch
index 331570a38..297d77f0e 100644
--- a/target/linux/ipq807x/patches-5.15/0129-arm64-dts-ipq8074-add-SPMI-PMIC-regulators.patch
+++ b/target/linux/ipq807x/patches-5.15/0129-arm64-dts-ipq8074-add-SPMI-PMIC-regulators.patch
@@ -13,8 +13,6 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 34 +++++++++++++++++++++++++++
  1 file changed, 34 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index f5c5778f8ab9..b821f1d37f9c 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 @@ -5,6 +5,7 @@
@@ -25,7 +23,7 @@ index f5c5778f8ab9..b821f1d37f9c 100644
  
  / {
  	model = "Qualcomm Technologies, Inc. IPQ8074";
-@@ -451,6 +452,39 @@ spmi_bus: spmi@200f000 {
+@@ -451,6 +452,39 @@
  			interrupt-controller;
  			#interrupt-cells = <4>;
  			cell-index = <0>;
@@ -65,6 +63,3 @@ index f5c5778f8ab9..b821f1d37f9c 100644
  		};
  
  		sdhc_1: sdhci@7824900 {
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0130-clk-qcom-clk-alpha-pll-add-support-for-APSS-PLL.patch b/target/linux/ipq807x/patches-5.15/0130-clk-qcom-clk-alpha-pll-add-support-for-APSS-PLL.patch
index 7a652322a..f8e02f933 100644
--- a/target/linux/ipq807x/patches-5.15/0130-clk-qcom-clk-alpha-pll-add-support-for-APSS-PLL.patch
+++ b/target/linux/ipq807x/patches-5.15/0130-clk-qcom-clk-alpha-pll-add-support-for-APSS-PLL.patch
@@ -14,11 +14,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  drivers/clk/qcom/clk-alpha-pll.h |  1 +
  2 files changed, 13 insertions(+)
 
-diff --git a/drivers/clk/qcom/clk-alpha-pll.c b/drivers/clk/qcom/clk-alpha-pll.c
-index 8f65b9bdafce..d2c3eb4cf4af 100644
 --- a/drivers/clk/qcom/clk-alpha-pll.c
 +++ b/drivers/clk/qcom/clk-alpha-pll.c
-@@ -139,6 +139,18 @@ const u8 clk_alpha_pll_regs[][PLL_OFF_MAX_REGS] = {
+@@ -139,6 +139,18 @@ const u8 clk_alpha_pll_regs[][PLL_OFF_MA
  		[PLL_OFF_OPMODE] = 0x28,
  		[PLL_OFF_STATUS] = 0x38,
  	},
@@ -37,8 +35,6 @@ index 8f65b9bdafce..d2c3eb4cf4af 100644
  };
  EXPORT_SYMBOL_GPL(clk_alpha_pll_regs);
  
-diff --git a/drivers/clk/qcom/clk-alpha-pll.h b/drivers/clk/qcom/clk-alpha-pll.h
-index 55e4fa47912f..45e4b93253a9 100644
 --- a/drivers/clk/qcom/clk-alpha-pll.h
 +++ b/drivers/clk/qcom/clk-alpha-pll.h
 @@ -17,6 +17,7 @@ enum {
@@ -49,6 +45,3 @@ index 55e4fa47912f..45e4b93253a9 100644
  	CLK_ALPHA_PLL_TYPE_MAX,
  };
  
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0131-clk-qcom-Add-DT-bindings-for-IPQ8074-APSS-clock-cont.patch b/target/linux/ipq807x/patches-5.15/0131-clk-qcom-Add-DT-bindings-for-IPQ8074-APSS-clock-cont.patch
index c9da7813a..93fa2ff27 100644
--- a/target/linux/ipq807x/patches-5.15/0131-clk-qcom-Add-DT-bindings-for-IPQ8074-APSS-clock-cont.patch
+++ b/target/linux/ipq807x/patches-5.15/0131-clk-qcom-Add-DT-bindings-for-IPQ8074-APSS-clock-cont.patch
@@ -11,9 +11,6 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  1 file changed, 14 insertions(+)
  create mode 100644 include/dt-bindings/clock/qcom,apss-ipq8074.h
 
-diff --git a/include/dt-bindings/clock/qcom,apss-ipq8074.h b/include/dt-bindings/clock/qcom,apss-ipq8074.h
-new file mode 100644
-index 000000000000..df07766b0146
 --- /dev/null
 +++ b/include/dt-bindings/clock/qcom,apss-ipq8074.h
 @@ -0,0 +1,14 @@
@@ -31,6 +28,3 @@ index 000000000000..df07766b0146
 +#define APCS_ALIAS0_CORE_CLK			3
 +
 +#endif
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0132-clk-qcom-Add-IPQ8074-APSS-clock-controller.patch b/target/linux/ipq807x/patches-5.15/0132-clk-qcom-Add-IPQ8074-APSS-clock-controller.patch
index 38403d629..3b5688591 100644
--- a/target/linux/ipq807x/patches-5.15/0132-clk-qcom-Add-IPQ8074-APSS-clock-controller.patch
+++ b/target/linux/ipq807x/patches-5.15/0132-clk-qcom-Add-IPQ8074-APSS-clock-controller.patch
@@ -16,8 +16,6 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  3 files changed, 181 insertions(+)
  create mode 100644 drivers/clk/qcom/apss-ipq8074.c
 
-diff --git a/drivers/clk/qcom/Kconfig b/drivers/clk/qcom/Kconfig
-index 9ef007b3cf9b..76f3c999e507 100644
 --- a/drivers/clk/qcom/Kconfig
 +++ b/drivers/clk/qcom/Kconfig
 @@ -134,6 +134,16 @@ config IPQ_APSS_6018
@@ -37,11 +35,9 @@ index 9ef007b3cf9b..76f3c999e507 100644
  config IPQ_GCC_4019
  	tristate "IPQ4019 Global Clock Controller"
  	help
-diff --git a/drivers/clk/qcom/Makefile b/drivers/clk/qcom/Makefile
-index 9825ef843f4a..a47b0dcc0add 100644
 --- a/drivers/clk/qcom/Makefile
 +++ b/drivers/clk/qcom/Makefile
-@@ -22,6 +22,7 @@ obj-$(CONFIG_APQ_MMCC_8084) += mmcc-apq8084.o
+@@ -22,6 +22,7 @@ obj-$(CONFIG_APQ_MMCC_8084) += mmcc-apq8
  obj-$(CONFIG_CLK_GFM_LPASS_SM8250) += lpass-gfm-sm8250.o
  obj-$(CONFIG_IPQ_APSS_PLL) += apss-ipq-pll.o
  obj-$(CONFIG_IPQ_APSS_6018) += apss-ipq6018.o
@@ -49,9 +45,6 @@ index 9825ef843f4a..a47b0dcc0add 100644
  obj-$(CONFIG_IPQ_GCC_4019) += gcc-ipq4019.o
  obj-$(CONFIG_IPQ_GCC_6018) += gcc-ipq6018.o
  obj-$(CONFIG_IPQ_GCC_806X) += gcc-ipq806x.o
-diff --git a/drivers/clk/qcom/apss-ipq8074.c b/drivers/clk/qcom/apss-ipq8074.c
-new file mode 100644
-index 000000000000..51548539194c
 --- /dev/null
 +++ b/drivers/clk/qcom/apss-ipq8074.c
 @@ -0,0 +1,170 @@
@@ -225,6 +218,3 @@ index 000000000000..51548539194c
 +
 +MODULE_DESCRIPTION("Qualcomm IPQ8074 APSS clock driver");
 +MODULE_LICENSE("GPLv2");
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0133-mailbox-qcom-apcs-ipc-add-IPQ8074-APSS-clock-control.patch b/target/linux/ipq807x/patches-5.15/0133-mailbox-qcom-apcs-ipc-add-IPQ8074-APSS-clock-control.patch
index ba61a9aaf..8aaf3032c 100644
--- a/target/linux/ipq807x/patches-5.15/0133-mailbox-qcom-apcs-ipc-add-IPQ8074-APSS-clock-control.patch
+++ b/target/linux/ipq807x/patches-5.15/0133-mailbox-qcom-apcs-ipc-add-IPQ8074-APSS-clock-control.patch
@@ -17,11 +17,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  drivers/mailbox/qcom-apcs-ipc-mailbox.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
-index 82ccfaf14b24..23407280580f 100644
 --- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c
 +++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
-@@ -34,7 +34,7 @@ static const struct qcom_apcs_ipc_data ipq6018_apcs_data = {
+@@ -34,7 +34,7 @@ static const struct qcom_apcs_ipc_data i
  };
  
  static const struct qcom_apcs_ipc_data ipq8074_apcs_data = {
@@ -30,7 +28,7 @@ index 82ccfaf14b24..23407280580f 100644
  };
  
  static const struct qcom_apcs_ipc_data msm8916_apcs_data = {
-@@ -73,7 +73,7 @@ static const struct regmap_config apcs_regmap_config = {
+@@ -73,7 +73,7 @@ static const struct regmap_config apcs_r
  	.reg_bits = 32,
  	.reg_stride = 4,
  	.val_bits = 32,
@@ -39,6 +37,3 @@ index 82ccfaf14b24..23407280580f 100644
  	.fast_io = true,
  };
  
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0134-arm64-dts-ipq8074-update-APCS-node-due-to-clock-supp.patch b/target/linux/ipq807x/patches-5.15/0134-arm64-dts-ipq8074-update-APCS-node-due-to-clock-supp.patch
index 133022d0d..64e89de82 100644
--- a/target/linux/ipq807x/patches-5.15/0134-arm64-dts-ipq8074-update-APCS-node-due-to-clock-supp.patch
+++ b/target/linux/ipq807x/patches-5.15/0134-arm64-dts-ipq8074-update-APCS-node-due-to-clock-supp.patch
@@ -13,11 +13,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index b821f1d37f9c..b2dd418891e6 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -971,8 +971,9 @@ IRQ_TYPE_LEVEL_HIGH>, /* int_c */
+@@ -971,8 +971,9 @@
  
  		apcs_glb: mailbox@b111000 {
  			compatible = "qcom,ipq8074-apcs-apps-global";
@@ -28,6 +26,3 @@ index b821f1d37f9c..b2dd418891e6 100644
  			#mbox-cells = <1>;
  		};
  
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0135-arm64-dts-ipq8074-add-CPU-clock-and-regulator.patch b/target/linux/ipq807x/patches-5.15/0135-arm64-dts-ipq8074-add-CPU-clock-and-regulator.patch
index 4e792d6a4..e0525cc8c 100644
--- a/target/linux/ipq807x/patches-5.15/0135-arm64-dts-ipq8074-add-CPU-clock-and-regulator.patch
+++ b/target/linux/ipq807x/patches-5.15/0135-arm64-dts-ipq8074-add-CPU-clock-and-regulator.patch
@@ -14,8 +14,6 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 13 +++++++++++++
  1 file changed, 13 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index b2dd418891e6..49a2a7d79c40 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 @@ -4,6 +4,7 @@
@@ -26,7 +24,7 @@ index b2dd418891e6..49a2a7d79c40 100644
  #include <dt-bindings/clock/qcom,gcc-ipq8074.h>
  #include <dt-bindings/spmi/spmi.h>
  
-@@ -35,6 +36,9 @@ CPU0: cpu@0 {
+@@ -35,6 +36,9 @@
  			reg = <0x0>;
  			next-level-cache = <&L2_0>;
  			enable-method = "psci";
@@ -36,7 +34,7 @@ index b2dd418891e6..49a2a7d79c40 100644
  		};
  
  		CPU1: cpu@1 {
-@@ -43,6 +47,9 @@ CPU1: cpu@1 {
+@@ -43,6 +47,9 @@
  			enable-method = "psci";
  			reg = <0x1>;
  			next-level-cache = <&L2_0>;
@@ -46,7 +44,7 @@ index b2dd418891e6..49a2a7d79c40 100644
  		};
  
  		CPU2: cpu@2 {
-@@ -51,6 +58,9 @@ CPU2: cpu@2 {
+@@ -51,6 +58,9 @@
  			enable-method = "psci";
  			reg = <0x2>;
  			next-level-cache = <&L2_0>;
@@ -56,7 +54,7 @@ index b2dd418891e6..49a2a7d79c40 100644
  		};
  
  		CPU3: cpu@3 {
-@@ -59,6 +69,9 @@ CPU3: cpu@3 {
+@@ -59,6 +69,9 @@
  			enable-method = "psci";
  			reg = <0x3>;
  			next-level-cache = <&L2_0>;
@@ -66,6 +64,3 @@ index b2dd418891e6..49a2a7d79c40 100644
  		};
  
  		L2_0: l2-cache {
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0136-arm64-dts-ipq8074-add-label-to-cpus.patch b/target/linux/ipq807x/patches-5.15/0136-arm64-dts-ipq8074-add-label-to-cpus.patch
index aff316b0e..9f217405b 100644
--- a/target/linux/ipq807x/patches-5.15/0136-arm64-dts-ipq8074-add-label-to-cpus.patch
+++ b/target/linux/ipq807x/patches-5.15/0136-arm64-dts-ipq8074-add-label-to-cpus.patch
@@ -12,11 +12,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  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 49a2a7d79c40..ab683526159e 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -26,7 +26,7 @@ xo: xo {
+@@ -26,7 +26,7 @@
  		};
  	};
  
@@ -25,6 +23,3 @@ index 49a2a7d79c40..ab683526159e 100644
  		#address-cells = <0x1>;
  		#size-cells = <0x0>;
  
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0137-arm64-dts-ipq8074-add-cooling-cells-to-CPU-nodes.patch b/target/linux/ipq807x/patches-5.15/0137-arm64-dts-ipq8074-add-cooling-cells-to-CPU-nodes.patch
index d203b700b..8bea2155d 100644
--- a/target/linux/ipq807x/patches-5.15/0137-arm64-dts-ipq8074-add-cooling-cells-to-CPU-nodes.patch
+++ b/target/linux/ipq807x/patches-5.15/0137-arm64-dts-ipq8074-add-cooling-cells-to-CPU-nodes.patch
@@ -12,11 +12,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  arch/arm64/boot/dts/qcom/ipq8074.dtsi | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index ab683526159e..69234f39ac8c 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -39,6 +39,7 @@ CPU0: cpu@0 {
+@@ -39,6 +39,7 @@
  			clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
  			clock-names = "cpu";
  			cpu-supply = <&s3>;
@@ -24,7 +22,7 @@ index ab683526159e..69234f39ac8c 100644
  		};
  
  		CPU1: cpu@1 {
-@@ -50,6 +51,7 @@ CPU1: cpu@1 {
+@@ -50,6 +51,7 @@
  			clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
  			clock-names = "cpu";
  			cpu-supply = <&s3>;
@@ -32,7 +30,7 @@ index ab683526159e..69234f39ac8c 100644
  		};
  
  		CPU2: cpu@2 {
-@@ -61,6 +63,7 @@ CPU2: cpu@2 {
+@@ -61,6 +63,7 @@
  			clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
  			clock-names = "cpu";
  			cpu-supply = <&s3>;
@@ -40,7 +38,7 @@ index ab683526159e..69234f39ac8c 100644
  		};
  
  		CPU3: cpu@3 {
-@@ -72,6 +75,7 @@ CPU3: cpu@3 {
+@@ -72,6 +75,7 @@
  			clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
  			clock-names = "cpu";
  			cpu-supply = <&s3>;
@@ -48,6 +46,3 @@ index ab683526159e..69234f39ac8c 100644
  		};
  
  		L2_0: l2-cache {
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0138-clk-ipq-support-for-resetting-multiple-bits.patch b/target/linux/ipq807x/patches-5.15/0138-clk-ipq-support-for-resetting-multiple-bits.patch
index 563d9e4ac..ccf09376a 100644
--- a/target/linux/ipq807x/patches-5.15/0138-clk-ipq-support-for-resetting-multiple-bits.patch
+++ b/target/linux/ipq807x/patches-5.15/0138-clk-ipq-support-for-resetting-multiple-bits.patch
@@ -24,11 +24,9 @@ Signed-off-by: Rajkumar Ayyasamy <arajkuma@codeaurora.org>
  drivers/clk/qcom/reset.h | 1 +
  2 files changed, 3 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/clk/qcom/reset.c b/drivers/clk/qcom/reset.c
-index 819d194be8f7..8ad7b50dd534 100644
 --- a/drivers/clk/qcom/reset.c
 +++ b/drivers/clk/qcom/reset.c
-@@ -28,7 +28,7 @@ qcom_reset_assert(struct reset_controller_dev *rcdev, unsigned long id)
+@@ -28,7 +28,7 @@ qcom_reset_assert(struct reset_controlle
  
  	rst = to_qcom_reset_controller(rcdev);
  	map = &rst->reset_map[id];
@@ -37,7 +35,7 @@ index 819d194be8f7..8ad7b50dd534 100644
  
  	return regmap_update_bits(rst->regmap, map->reg, mask, mask);
  }
-@@ -42,7 +42,7 @@ qcom_reset_deassert(struct reset_controller_dev *rcdev, unsigned long id)
+@@ -42,7 +42,7 @@ qcom_reset_deassert(struct reset_control
  
  	rst = to_qcom_reset_controller(rcdev);
  	map = &rst->reset_map[id];
@@ -46,8 +44,6 @@ index 819d194be8f7..8ad7b50dd534 100644
  
  	return regmap_update_bits(rst->regmap, map->reg, mask, 0);
  }
-diff --git a/drivers/clk/qcom/reset.h b/drivers/clk/qcom/reset.h
-index 2a08b5e282c7..0410f83bf2bb 100644
 --- a/drivers/clk/qcom/reset.h
 +++ b/drivers/clk/qcom/reset.h
 @@ -11,6 +11,7 @@
@@ -58,6 +54,3 @@ index 2a08b5e282c7..0410f83bf2bb 100644
  };
  
  struct regmap;
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0139-clk-qcom-ipq8074-add-missing-networking-resets.patch b/target/linux/ipq807x/patches-5.15/0139-clk-qcom-ipq8074-add-missing-networking-resets.patch
index 5d807d323..1f0320a86 100644
--- a/target/linux/ipq807x/patches-5.15/0139-clk-qcom-ipq8074-add-missing-networking-resets.patch
+++ b/target/linux/ipq807x/patches-5.15/0139-clk-qcom-ipq8074-add-missing-networking-resets.patch
@@ -15,11 +15,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  include/dt-bindings/clock/qcom,gcc-ipq8074.h | 14 ++++++++++++++
  2 files changed, 28 insertions(+)
 
-diff --git a/drivers/clk/qcom/gcc-ipq8074.c b/drivers/clk/qcom/gcc-ipq8074.c
-index 4d6e8c47515f..759e676d4110 100644
 --- a/drivers/clk/qcom/gcc-ipq8074.c
 +++ b/drivers/clk/qcom/gcc-ipq8074.c
-@@ -4745,6 +4745,20 @@ static const struct qcom_reset_map gcc_ipq8074_resets[] = {
+@@ -4791,6 +4791,20 @@ static const struct qcom_reset_map gcc_i
  	[GCC_PCIE1_AHB_ARES] = { 0x76040, 5 },
  	[GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 },
  	[GCC_WCSSAON_RESET] = { 0x59010, 0 },
@@ -40,8 +38,6 @@ index 4d6e8c47515f..759e676d4110 100644
  };
  
  static const struct of_device_id gcc_ipq8074_match_table[] = {
-diff --git a/include/dt-bindings/clock/qcom,gcc-ipq8074.h b/include/dt-bindings/clock/qcom,gcc-ipq8074.h
-index 9b1c42bc430c..07402d970959 100644
 --- a/include/dt-bindings/clock/qcom,gcc-ipq8074.h
 +++ b/include/dt-bindings/clock/qcom,gcc-ipq8074.h
 @@ -367,5 +367,19 @@
@@ -64,6 +60,3 @@ index 9b1c42bc430c..07402d970959 100644
 +#define GCC_NSSPORT6_RESET			146
  
  #endif
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0141-clk-qcom-ipq8074-disable-USB-GDSC-s-SW_COLLAPSE.patch b/target/linux/ipq807x/patches-5.15/0141-clk-qcom-ipq8074-disable-USB-GDSC-s-SW_COLLAPSE.patch
index 39cb2b569..224531a8b 100644
--- a/target/linux/ipq807x/patches-5.15/0141-clk-qcom-ipq8074-disable-USB-GDSC-s-SW_COLLAPSE.patch
+++ b/target/linux/ipq807x/patches-5.15/0141-clk-qcom-ipq8074-disable-USB-GDSC-s-SW_COLLAPSE.patch
@@ -14,13 +14,11 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  drivers/clk/qcom/gcc-ipq8074.c | 5 +++++
  1 file changed, 5 insertions(+)
 
-diff --git a/drivers/clk/qcom/gcc-ipq8074.c b/drivers/clk/qcom/gcc-ipq8074.c
-index 244d1d8468e4..827c37787fa4 100644
 --- a/drivers/clk/qcom/gcc-ipq8074.c
 +++ b/drivers/clk/qcom/gcc-ipq8074.c
-@@ -4820,6 +4820,11 @@ static int gcc_ipq8074_probe(struct platform_device *pdev)
- 	if (IS_ERR(regmap))
- 		return PTR_ERR(regmap);
+@@ -4842,6 +4842,11 @@ static int gcc_ipq8074_probe(struct plat
+ 	/* SW Workaround for UBI32 Huayra PLL */
+ 	regmap_update_bits(regmap, 0x2501c, BIT(26), BIT(26));
  
 +	/* Disable SW_COLLAPSE for USB0 GDSCR */
 +	regmap_update_bits(regmap, 0x3e078, BIT(0), 0x0);
@@ -30,6 +28,3 @@ index 244d1d8468e4..827c37787fa4 100644
  	clk_alpha_pll_configure(&ubi32_pll_main, regmap, &ubi32_pll_config);
  	clk_alpha_pll_configure(&nss_crypto_pll_main, regmap,
  				&nss_crypto_pll_config);
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0142-clk-qcom-ipq8074-SW-workaround-for-UBI32-PLL-lock.patch b/target/linux/ipq807x/patches-5.15/0142-clk-qcom-ipq8074-SW-workaround-for-UBI32-PLL-lock.patch
index 488914b16..8867a2b57 100644
--- a/target/linux/ipq807x/patches-5.15/0142-clk-qcom-ipq8074-SW-workaround-for-UBI32-PLL-lock.patch
+++ b/target/linux/ipq807x/patches-5.15/0142-clk-qcom-ipq8074-SW-workaround-for-UBI32-PLL-lock.patch
@@ -17,11 +17,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  drivers/clk/qcom/gcc-ipq8074.c | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/drivers/clk/qcom/gcc-ipq8074.c b/drivers/clk/qcom/gcc-ipq8074.c
-index 827c37787fa4..cef89ea761d6 100644
 --- a/drivers/clk/qcom/gcc-ipq8074.c
 +++ b/drivers/clk/qcom/gcc-ipq8074.c
-@@ -4825,6 +4825,9 @@ static int gcc_ipq8074_probe(struct platform_device *pdev)
+@@ -4847,6 +4847,9 @@ static int gcc_ipq8074_probe(struct plat
  	/* Disable SW_COLLAPSE for USB1 GDSCR */
  	regmap_update_bits(regmap, 0x3f078, BIT(0), 0x0);
  
@@ -31,6 +29,3 @@ index 827c37787fa4..cef89ea761d6 100644
  	clk_alpha_pll_configure(&ubi32_pll_main, regmap, &ubi32_pll_config);
  	clk_alpha_pll_configure(&nss_crypto_pll_main, regmap,
  				&nss_crypto_pll_config);
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0145-clk-qcom-ipq8074-add-PPE-crypto-clock.patch b/target/linux/ipq807x/patches-5.15/0145-clk-qcom-ipq8074-add-PPE-crypto-clock.patch
index f3a2f200f..5e7099c77 100644
--- a/target/linux/ipq807x/patches-5.15/0145-clk-qcom-ipq8074-add-PPE-crypto-clock.patch
+++ b/target/linux/ipq807x/patches-5.15/0145-clk-qcom-ipq8074-add-PPE-crypto-clock.patch
@@ -14,11 +14,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  include/dt-bindings/clock/qcom,gcc-ipq8074.h |  1 +
  2 files changed, 20 insertions(+)
 
-diff --git a/drivers/clk/qcom/gcc-ipq8074.c b/drivers/clk/qcom/gcc-ipq8074.c
-index c24e33321f72..6ece246f54a9 100644
 --- a/drivers/clk/qcom/gcc-ipq8074.c
 +++ b/drivers/clk/qcom/gcc-ipq8074.c
-@@ -3182,6 +3182,24 @@ static struct clk_branch gcc_nss_ptp_ref_clk = {
+@@ -3183,6 +3183,24 @@ static struct clk_branch gcc_nss_ptp_ref
  	},
  };
  
@@ -43,7 +41,7 @@ index c24e33321f72..6ece246f54a9 100644
  static struct clk_branch gcc_nssnoc_ce_apb_clk = {
  	.halt_reg = 0x6830c,
  	.clkr = {
-@@ -4644,6 +4662,7 @@ static struct clk_regmap *gcc_ipq8074_clks[] = {
+@@ -4655,6 +4673,7 @@ static struct clk_regmap *gcc_ipq8074_cl
  	[GCC_PCIE0_RCHNG_CLK_SRC] = &pcie0_rchng_clk_src.clkr,
  	[GCC_PCIE0_RCHNG_CLK] = &gcc_pcie0_rchng_clk.clkr,
  	[GCC_PCIE0_AXI_S_BRIDGE_CLK] = &gcc_pcie0_axi_s_bridge_clk.clkr,
@@ -51,8 +49,6 @@ index c24e33321f72..6ece246f54a9 100644
  };
  
  static const struct qcom_reset_map gcc_ipq8074_resets[] = {
-diff --git a/include/dt-bindings/clock/qcom,gcc-ipq8074.h b/include/dt-bindings/clock/qcom,gcc-ipq8074.h
-index 07402d970959..3ed155969c5d 100644
 --- a/include/dt-bindings/clock/qcom,gcc-ipq8074.h
 +++ b/include/dt-bindings/clock/qcom,gcc-ipq8074.h
 @@ -233,6 +233,7 @@
@@ -63,6 +59,3 @@ index 07402d970959..3ed155969c5d 100644
  
  #define GCC_BLSP1_BCR				0
  #define GCC_BLSP1_QUP1_BCR			1
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0300-regulator-add-Qualcomm-CPR-regulators.patch b/target/linux/ipq807x/patches-5.15/0300-regulator-add-Qualcomm-CPR-regulators.patch
index 0a7db87ef..a3df7474b 100644
--- a/target/linux/ipq807x/patches-5.15/0300-regulator-add-Qualcomm-CPR-regulators.patch
+++ b/target/linux/ipq807x/patches-5.15/0300-regulator-add-Qualcomm-CPR-regulators.patch
@@ -11,8 +11,6 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  drivers/regulator/Makefile |  3 +++
  2 files changed, 36 insertions(+)
 
-diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
-index 4fd13b06231f..92164c80cbc4 100644
 --- a/drivers/regulator/Kconfig
 +++ b/drivers/regulator/Kconfig
 @@ -1423,5 +1423,38 @@ config REGULATOR_QCOM_LABIBB
@@ -54,11 +52,9 @@ index 4fd13b06231f..92164c80cbc4 100644
 +
  endif
  
-diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
-index 9e382b50a5ef..2e521cb39e7e 100644
 --- a/drivers/regulator/Makefile
 +++ b/drivers/regulator/Makefile
-@@ -105,6 +105,9 @@ obj-$(CONFIG_REGULATOR_QCOM_RPMH) += qcom-rpmh-regulator.o
+@@ -105,6 +105,9 @@ obj-$(CONFIG_REGULATOR_QCOM_RPMH) += qco
  obj-$(CONFIG_REGULATOR_QCOM_SMD_RPM) += qcom_smd-regulator.o
  obj-$(CONFIG_REGULATOR_QCOM_SPMI) += qcom_spmi-regulator.o
  obj-$(CONFIG_REGULATOR_QCOM_USB_VBUS) += qcom_usb_vbus-regulator.o
@@ -68,6 +64,3 @@ index 9e382b50a5ef..2e521cb39e7e 100644
  obj-$(CONFIG_REGULATOR_PALMAS) += palmas-regulator.o
  obj-$(CONFIG_REGULATOR_PCA9450) += pca9450-regulator.o
  obj-$(CONFIG_REGULATOR_PF8X00) += pf8x00-regulator.o
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0301-power-Add-Qualcomm-APM.patch b/target/linux/ipq807x/patches-5.15/0301-power-Add-Qualcomm-APM.patch
index af3373cea..a7ff87826 100644
--- a/target/linux/ipq807x/patches-5.15/0301-power-Add-Qualcomm-APM.patch
+++ b/target/linux/ipq807x/patches-5.15/0301-power-Add-Qualcomm-APM.patch
@@ -11,8 +11,6 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  drivers/power/Makefile | 1 +
  2 files changed, 2 insertions(+)
 
-diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
-index 696bf77a7042..235f3cbf2a54 100644
 --- a/drivers/power/Kconfig
 +++ b/drivers/power/Kconfig
 @@ -1,3 +1,4 @@
@@ -20,8 +18,6 @@ index 696bf77a7042..235f3cbf2a54 100644
  source "drivers/power/reset/Kconfig"
  source "drivers/power/supply/Kconfig"
 +source "drivers/power/qcom/Kconfig"
-diff --git a/drivers/power/Makefile b/drivers/power/Makefile
-index effbf0377f32..cd239e730b2b 100644
 --- a/drivers/power/Makefile
 +++ b/drivers/power/Makefile
 @@ -1,3 +1,4 @@
@@ -29,6 +25,3 @@ index effbf0377f32..cd239e730b2b 100644
  obj-$(CONFIG_POWER_RESET)	+= reset/
  obj-$(CONFIG_POWER_SUPPLY)	+= supply/
 +obj-$(CONFIG_QCOM_APM)		+= qcom/
--- 
-2.35.1
-
diff --git a/target/linux/ipq807x/patches-5.15/0603-net-core-Flag-to-identify-ingress-shaping-done-for-e.patch b/target/linux/ipq807x/patches-5.15/0603-net-core-Flag-to-identify-ingress-shaping-done-for-e.patch
index b47bf6e4d..b3c76115f 100644
--- a/target/linux/ipq807x/patches-5.15/0603-net-core-Flag-to-identify-ingress-shaping-done-for-e.patch
+++ b/target/linux/ipq807x/patches-5.15/0603-net-core-Flag-to-identify-ingress-shaping-done-for-e.patch
@@ -22,7 +22,7 @@ variable names created with 603.
   *	@tc_at_ingress: used within tc_classify to distinguish in/egress
   *	@redirected: packet was redirected by packet classifier
   *	@from_ingress: packet was redirected from the ingress path
-@@ -903,6 +904,7 @@ struct sk_buff {
+@@ -904,6 +905,7 @@ struct sk_buff {
  #ifdef CONFIG_NET_CLS_ACT
  	__u8			tc_skip_classify:1;
  	__u8			tc_at_ingress:1;
diff --git a/target/linux/ipq807x/patches-5.15/0901-arm64-dts-ipq8074-add-label-to-clocks.patch b/target/linux/ipq807x/patches-5.15/0901-arm64-dts-ipq8074-add-label-to-clocks.patch
index 759cd2e48..642349a3b 100644
--- a/target/linux/ipq807x/patches-5.15/0901-arm64-dts-ipq8074-add-label-to-clocks.patch
+++ b/target/linux/ipq807x/patches-5.15/0901-arm64-dts-ipq8074-add-label-to-clocks.patch
@@ -11,11 +11,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  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 daf59a579b8f..e81fe66669c8 100644
 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -12,7 +12,7 @@ / {
+@@ -12,7 +12,7 @@
  	model = "Qualcomm Technologies, Inc. IPQ8074";
  	compatible = "qcom,ipq8074";
  
@@ -23,7 +21,4 @@ index daf59a579b8f..e81fe66669c8 100644
 +	clocks: clocks {
  		sleep_clk: sleep_clk {
  			compatible = "fixed-clock";
- 			clock-frequency = <32000>;
--- 
-2.35.1
-
+ 			clock-frequency = <32768>;
diff --git a/target/linux/mediatek/patches-5.15/410-bt-mtk-serial-fix.patch b/target/linux/mediatek/patches-5.15/410-bt-mtk-serial-fix.patch
index e61b3dd94..69647e075 100644
--- a/target/linux/mediatek/patches-5.15/410-bt-mtk-serial-fix.patch
+++ b/target/linux/mediatek/patches-5.15/410-bt-mtk-serial-fix.patch
@@ -19,7 +19,7 @@
  	},
  	[PORT_NPCM] = {
  		.name		= "Nuvoton 16550",
-@@ -2748,6 +2748,11 @@ serial8250_do_set_termios(struct uart_po
+@@ -2753,6 +2753,11 @@ serial8250_do_set_termios(struct uart_po
  	unsigned long flags;
  	unsigned int baud, quot, frac = 0;
  
diff --git a/target/linux/ramips/patches-5.15/830-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch b/target/linux/ramips/patches-5.15/830-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
index 1992850d8..21538859a 100644
--- a/target/linux/ramips/patches-5.15/830-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
+++ b/target/linux/ramips/patches-5.15/830-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
@@ -25,7 +25,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 
 --- a/drivers/mmc/host/Kconfig
 +++ b/drivers/mmc/host/Kconfig
-@@ -1091,3 +1091,5 @@ config MMC_OWL
+@@ -1092,3 +1092,5 @@ config MMC_OWL
  
  config MMC_SDHCI_EXTERNAL_DMA
  	bool
diff --git a/target/linux/rockchip/patches-5.15/040-v5.18-usb-dwc3-core-do-not-use-3.0-clock-when-operating-in-2.0.patch b/target/linux/rockchip/patches-5.15/040-v5.18-usb-dwc3-core-do-not-use-3.0-clock-when-operating-in-2.0.patch
index 2d6544a76..95c29a284 100644
--- a/target/linux/rockchip/patches-5.15/040-v5.18-usb-dwc3-core-do-not-use-3.0-clock-when-operating-in-2.0.patch
+++ b/target/linux/rockchip/patches-5.15/040-v5.18-usb-dwc3-core-do-not-use-3.0-clock-when-operating-in-2.0.patch
@@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/drivers/usb/dwc3/core.c
 +++ b/drivers/usb/dwc3/core.c
-@@ -1066,6 +1066,11 @@ static int dwc3_core_init(struct dwc3 *d
+@@ -1081,6 +1081,11 @@ static int dwc3_core_init(struct dwc3 *d
  		if (dwc->parkmode_disable_ss_quirk)
  			reg |= DWC3_GUCTL1_PARKMODE_DISABLE_SS;
  
@@ -43,4 +43,4 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +#define DWC3_GUCTL1_DEV_FORCE_20_CLK_FOR_30_CLK	BIT(26)
  #define DWC3_GUCTL1_DEV_L1_EXIT_BY_HW		BIT(24)
  #define DWC3_GUCTL1_PARKMODE_DISABLE_SS		BIT(17)
- 
+ #define DWC3_GUCTL1_RESUME_OPMODE_HS_HOST	BIT(10)
diff --git a/target/linux/rockchip/patches-5.15/108-net-phy-add-support-for-Motorcomm-yt8531C-phy.patch b/target/linux/rockchip/patches-5.15/108-net-phy-add-support-for-Motorcomm-yt8531C-phy.patch
index efb70f8a2..66dc89728 100644
--- a/target/linux/rockchip/patches-5.15/108-net-phy-add-support-for-Motorcomm-yt8531C-phy.patch
+++ b/target/linux/rockchip/patches-5.15/108-net-phy-add-support-for-Motorcomm-yt8531C-phy.patch
@@ -62,7 +62,7 @@ Signed-off-by: Furkan Kardame <f.kardame@manjaro.org>
  static int yt8511_read_page(struct phy_device *phydev)
  {
  	return __phy_read(phydev, YT8511_PAGE_SELECT);
-@@ -111,6 +145,51 @@ static int yt8511_config_init(struct phy_device *phydev)
+@@ -111,6 +144,51 @@ err_restore_page:
  	return phy_restore_page(phydev, oldpage, ret);
  }
  
@@ -114,7 +114,7 @@ Signed-off-by: Furkan Kardame <f.kardame@manjaro.org>
  static struct phy_driver motorcomm_phy_drvs[] = {
  	{
  		PHY_ID_MATCH_EXACT(PHY_ID_YT8511),
-@@ -120,7 +200,16 @@ static struct phy_driver motorcomm_phy_drvs[] = {
+@@ -120,7 +198,16 @@ static struct phy_driver motorcomm_phy_d
  		.resume		= genphy_resume,
  		.read_page	= yt8511_read_page,
  		.write_page	= yt8511_write_page,
@@ -131,7 +131,7 @@ Signed-off-by: Furkan Kardame <f.kardame@manjaro.org>
  };
  
  module_phy_driver(motorcomm_phy_drvs);
-@@ -131,6 +220,7 @@ MODULE_LICENSE("GPL");
+@@ -131,6 +218,7 @@ MODULE_LICENSE("GPL");
  
  static const struct mdio_device_id __maybe_unused motorcomm_tbl[] = {
  	{ PHY_ID_MATCH_EXACT(PHY_ID_YT8511) },
diff --git a/target/linux/rockchip/patches-5.15/211-rockchip-rk3399-add-support-for-Rongpin-King3399.patch b/target/linux/rockchip/patches-5.15/211-rockchip-rk3399-add-support-for-Rongpin-King3399.patch
old mode 100755
new mode 100644
index 6a74f0bfa..f84f48219
--- a/target/linux/rockchip/patches-5.15/211-rockchip-rk3399-add-support-for-Rongpin-King3399.patch
+++ b/target/linux/rockchip/patches-5.15/211-rockchip-rk3399-add-support-for-Rongpin-King3399.patch
@@ -1,10 +1,10 @@
 --- a/arch/arm64/boot/dts/rockchip/Makefile
 +++ b/arch/arm64/boot/dts/rockchip/Makefile
-@@ -58,6 +58,7 @@
+@@ -58,6 +58,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ro
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb
 +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-king3399.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-mrkaio-m68s.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nanopi-r5s.dtb
\ No newline at end of file
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nanopi-r5s.dtb