diff --git a/arch/arm64/boot/dts/vendor/bindings/arm/msm/subsystem-sleep-stats.yaml b/arch/arm64/boot/dts/vendor/bindings/arm/msm/subsystem-sleep-stats.yaml
index 53e038718b83..d7a7a80f199e 100644
--- a/arch/arm64/boot/dts/vendor/bindings/arm/msm/subsystem-sleep-stats.yaml
+++ b/arch/arm64/boot/dts/vendor/bindings/arm/msm/subsystem-sleep-stats.yaml
@@ -23,9 +23,15 @@ properties:
    Value type: <string>
    Definition: Should be "qcom,subsystem-sleep-stats".
 
+  reg:
+    maxItems: 1
+
+required:
+  - compatible
 
 example:
   - |
     subsystem-sleep-stats {
 		compatible = "qcom,subsystem-sleep-stats";
+		reg = <0xc3f0000 0 0x400>;
 	};
diff --git a/arch/arm64/boot/dts/vendor/bindings/cnss/cnss-wlan.txt b/arch/arm64/boot/dts/vendor/bindings/cnss/cnss-wlan.txt
index 0309934b1cda..7be180ac82b5 100644
--- a/arch/arm64/boot/dts/vendor/bindings/cnss/cnss-wlan.txt
+++ b/arch/arm64/boot/dts/vendor/bindings/cnss/cnss-wlan.txt
@@ -92,6 +92,7 @@ Optional properties:
 		regulator used in internal power amplifier for QCA6490
   - cnss-enable-self-recovery: Boolean property to enable self recovery when
                                recovery is trigeered with reason link down.
+  - default_gen_speed: U32 property to specify pcie default gen speed.
   - qcom,bt-en-gpio: QCA6490 requires synchronization for BT and WLAN GPIO
 		enable to resolve PMU power up issues. Provide BT GPIO using
 		this config param.
diff --git a/arch/arm64/boot/dts/vendor/bindings/gpu/adreno.txt b/arch/arm64/boot/dts/vendor/bindings/gpu/adreno.txt
index e828d5e1439d..9161b8075a6e 100644
--- a/arch/arm64/boot/dts/vendor/bindings/gpu/adreno.txt
+++ b/arch/arm64/boot/dts/vendor/bindings/gpu/adreno.txt
@@ -8,6 +8,7 @@ Required properties:
 			Must include "qcom,adreno-gpu-a619-holi" for Holi target.
 			Must include "qcom,adreno-gpu-a642" for Shima target.
 			Must include "qcom,adreno-gpu-a642l" for Yupik target.
+			Must include "qcom,adreno-gpu-a643" for Yupik a643 target.
 - reg:			Specifies the list of register regions for the device.
 - reg-names:		Resource names used for the register regions specified
 			in reg.
diff --git a/arch/arm64/boot/dts/vendor/bindings/input/qpnp-power-on.txt b/arch/arm64/boot/dts/vendor/bindings/input/qpnp-power-on.txt
index b9bb2bfea1ae..2db6719b2c54 100644
--- a/arch/arm64/boot/dts/vendor/bindings/input/qpnp-power-on.txt
+++ b/arch/arm64/boot/dts/vendor/bindings/input/qpnp-power-on.txt
@@ -129,6 +129,8 @@ Optional properties:
 - qcom,use-legacy-hard-reset-offset       Boolean property to support legacy
 				hard-reset offset of the PON_RB_SPARE register for
 				some (PON gen2) platforms.
+- qcom,log-kpd-event:		Boolean property to enable logging of KPDPWR status
+				during driver INIT and runtime when key is pressed.
 
 Optional Sub-nodes:
 - qcom,pon_1 ... qcom,pon_n:	These PON child nodes correspond to features
diff --git a/arch/arm64/boot/dts/vendor/bindings/pci/msm_ep_pcie.txt b/arch/arm64/boot/dts/vendor/bindings/pci/msm_ep_pcie.txt
index 425bddc9533d..734ab549c880 100644
--- a/arch/arm64/boot/dts/vendor/bindings/pci/msm_ep_pcie.txt
+++ b/arch/arm64/boot/dts/vendor/bindings/pci/msm_ep_pcie.txt
@@ -75,6 +75,8 @@ Optional Properties:
 	- qcom,msm-bus,vectors-KBps
   - qcom,pcie-m2-autonomous: Enable L1ss sleep/exit to support M2 autonomous mode.
   - qcom,mhi-soc-reset-offset: AXI register offset to initiate a SOC reset.
+  - qcom,avoid-reboot-in-d3hot: Ensures device is not in D3hot during
+    reboot/panic.
 
 Example:
 
diff --git a/arch/arm64/boot/dts/vendor/bindings/power/reset/qcom,dload-mode.yaml b/arch/arm64/boot/dts/vendor/bindings/power/reset/qcom,dload-mode.yaml
index 067d6eb2b032..ce65735c956b 100644
--- a/arch/arm64/boot/dts/vendor/bindings/power/reset/qcom,dload-mode.yaml
+++ b/arch/arm64/boot/dts/vendor/bindings/power/reset/qcom,dload-mode.yaml
@@ -16,6 +16,18 @@ properties:
   compatible:
     items:
       - const: qcom,dload-mode
+  reg:
+    Value type: <prop-encoded-array>
+    Definition: The base address and size for reading the proper configuration
+                related information.
+
+  reg-names:
+    Value type: string
+    Definition: The reg name for reading the configurations.
+
+  qcom,boot-config-shift:
+    Value type: <prop-encoded-array>
+    Definition: The range of bits from low to high.
 
 required:
   - compatible
diff --git a/arch/arm64/boot/dts/vendor/bindings/sound/qcom-audio-dev.txt b/arch/arm64/boot/dts/vendor/bindings/sound/qcom-audio-dev.txt
index 5c4fd50ae840..e6e028d832d2 100644
--- a/arch/arm64/boot/dts/vendor/bindings/sound/qcom-audio-dev.txt
+++ b/arch/arm64/boot/dts/vendor/bindings/sound/qcom-audio-dev.txt
@@ -1444,8 +1444,10 @@ Example:
 				"msm-pcm-routing", "msm-cpe-lsm",
 				"msm-compr-dsp", "msm-pcm-dsp-noirq";
 		asoc-cpu = <&dai_hdmi>, <&dai_dp>,
-				<&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
+				<&dai_mi2s0_rx>, <&dai_mi2s0_tx>,
+				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,
+				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,
+				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,
 				<&dai_pri_auxpcm>, <&dai_sec_auxpcm>,
 				<&dai_tert_auxpcm>, <&dai_quat_auxpcm>,
 				<&sb_0_rx>, <&sb_0_tx>, <&sb_1_rx>, <&sb_1_tx>,
@@ -1468,6 +1470,8 @@ Example:
 		asoc-cpu-names = "msm-dai-q6-hdmi.8",  "msm-dai-q6-dp.24608",
 				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
 				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
+				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",
+				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",
 				"msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",
 				"msm-dai-q6-auxpcm.3", "msm-dai-q6-auxpcm.4",
 				"msm-dai-q6-dev.16384", "msm-dai-q6-dev.16385",
@@ -1578,9 +1582,12 @@ Example:
 				"msm-pcm-routing", "msm-compr-dsp",
 				"msm-pcm-dsp-noirq";
 		asoc-cpu = <&dai_dp>,
-				<&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_mi2s4>, <&dai_pri_auxpcm>,
+				<&dai_mi2s0_rx>, <&dai_mi2s0_tx>,
+				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,
+				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,
+				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,
+				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,
+				<&dai_pri_auxpcm>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
 				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
@@ -1608,7 +1615,10 @@ Example:
 		asoc-cpu-names = "msm-dai-q6-dp.24608",
 				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
 				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
-				"msm-dai-q6-mi2s.4", "msm-dai-q6-auxpcm.1",
+				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",
+				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",
+				"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",
+				"msm-dai-q6-auxpcm.1",
 				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",
 				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",
 				"msm-dai-q6-dev.224",
@@ -1714,9 +1724,12 @@ Example:
 				"msm-pcm-dsp-noirq", "msm-pcm-loopback.1",
 				"msm-pcm-dtmf";
 		asoc-cpu = <&dai_hdmi>, <&dai_dp>,
-				<&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_mi2s4>, <&dai_pri_auxpcm>,
+				<&dai_mi2s0_rx>, <&dai_mi2s0_tx>,
+				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,
+				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,
+				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,
+				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,
+				<&dai_pri_auxpcm>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
 				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
@@ -1748,7 +1761,10 @@ Example:
 		asoc-cpu-names = "msm-dai-q6-hdmi.8",  "msm-dai-q6-dp.24608",
 				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
 				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
-				"msm-dai-q6-mi2s.4", "msm-dai-q6-auxpcm.1",
+				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",
+				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",
+				"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",
+				"msm-dai-q6-auxpcm.1",
 				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",
 				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",
 				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",
@@ -1857,9 +1873,12 @@ Example:
 				"msm-pcm-afe", "msm-lsm-client",
 				"msm-pcm-routing", "msm-compr-dsp",
 				"msm-pcm-dsp-noirq";
-		asoc-cpu = <&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_mi2s4>, <&dai_pri_auxpcm>,
+		asoc-cpu = <&dai_mi2s0_rx>, <&dai_mi2s0_tx>,
+				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,
+				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,
+				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,
+				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,
+				<&dai_pri_auxpcm>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
 				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
@@ -1885,7 +1904,10 @@ Example:
 				<&tx_cdc_dma_6_tx>, <&tx_cdc_dma_7_tx>;
 		asoc-cpu-names = "msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
 				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
-				"msm-dai-q6-mi2s.4", "msm-dai-q6-auxpcm.1",
+				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",
+				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",
+				"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",
+				"msm-dai-q6-auxpcm.1",
 				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",
 				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",
 				"msm-dai-q6-dev.224",
@@ -2147,9 +2169,12 @@ Example:
 				"msm-pcm-routing", "msm-compr-dsp",
 				"msm-pcm-dsp-noirq";
 		asoc-cpu = <&dai_dp>,
-				<&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_mi2s4>, <&dai_pri_auxpcm>,
+				<&dai_mi2s0_rx>, <&dai_mi2s0_rx>,
+				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,
+				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,
+				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,
+				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,
+				<&dai_pri_auxpcm>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
 				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
@@ -2176,7 +2201,10 @@ Example:
 		asoc-cpu-names = "msm-dai-q6-dp.24608",
 				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
 				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
-				"msm-dai-q6-mi2s.4", "msm-dai-q6-auxpcm.1",
+				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",
+				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",
+				"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",
+				"msm-dai-q6-auxpcm.1",
 				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",
 				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",
 				"msm-dai-q6-dev.224",
@@ -2300,9 +2328,12 @@ Example:
 				"msm-pcm-dsp-noirq", "msm-pcm-loopback.1",
 				"msm-pcm-dtmf";
 		asoc-cpu = <&dai_hdmi>, <&dai_dp>,
-				<&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_mi2s4>, <&dai_pri_auxpcm>,
+				<&dai_mi2s0_rx>, <&dai_mi2s0_rx>,
+				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,
+				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,
+				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,
+				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,
+				<&dai_pri_auxpcm>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
 				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
@@ -2334,7 +2365,10 @@ Example:
 		asoc-cpu-names = "msm-dai-q6-hdmi.8",  "msm-dai-q6-dp.24608",
 				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
 				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
-				"msm-dai-q6-mi2s.4", "msm-dai-q6-auxpcm.1",
+				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",
+				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",
+				"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",
+				"msm-dai-q6-auxpcm.1",
 				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",
 				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",
 				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",
@@ -2444,9 +2478,13 @@ Example:
 				"msm-pcm-routing", "msm-compr-dsp",
 				"msm-pcm-dsp-noirq";
 		asoc-cpu = <&dai_dp>, <&dai_dp1>,
-				<&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_mi2s4>, <&dai_mi2s5>, <&dai_pri_auxpcm>,
+				<&dai_mi2s0_rx>, <&dai_mi2s0_tx>,
+				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,
+				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,
+				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,
+				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,
+				<&dai_mi2s5_rx>, <&dai_mi2s5_tx>,
+				<&dai_pri_auxpcm>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
 				<&dai_sen_auxpcm>,
@@ -2479,6 +2517,9 @@ Example:
 				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
 				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
 				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",
+				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",
+				"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",
+				"msm-dai-q6-mi2s.10", "msm-dai-q6-mi2s.11",
 				"msm-dai-q6-auxpcm.1",
 				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",
 				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",
@@ -2595,8 +2636,10 @@ Example:
 				"msm-pcm-afe", "msm-lsm-client",
 				"msm-pcm-routing", "msm-compr-dsp",
 				"msm-pcm-dsp-noirq";
-		asoc-cpu = <&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
+		asoc-cpu = <&dai_mi2s0_rx>, <&dai_mi2s0_tx>,
+				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,
+				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,
+				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,
 				<&dai_pri_auxpcm>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>,
@@ -2623,6 +2666,8 @@ Example:
 				<&rx_cdc_dma_7_rx>,<&afe_loopback_tx>;
 		asoc-cpu-names = "msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
 				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
+				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",
+				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",
 				"msm-dai-q6-auxpcm.1",
 				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",
 				"msm-dai-q6-auxpcm.4",
@@ -2802,9 +2847,12 @@ Example:
 				"msm-pcm-dsp-noirq", "msm-pcm-loopback.1",
 				"msm-pcm-dtmf";
 		asoc-cpu = <&dai_hdmi>, <&dai_dp>,
-				<&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_mi2s4>, <&dai_pri_auxpcm>,
+				<&dai_mi2s0_rx>, <&dai_mi2s0_tx>,
+				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,
+				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,
+				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,
+				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,
+				<&dai_pri_auxpcm>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
 				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
@@ -2836,7 +2884,10 @@ Example:
 		asoc-cpu-names = "msm-dai-q6-hdmi.8",  "msm-dai-q6-dp.24608",
 				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
 				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
-				"msm-dai-q6-mi2s.4", "msm-dai-q6-auxpcm.1",
+				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",
+				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",
+				"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",
+				"msm-dai-q6-auxpcm.1",
 				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",
 				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",
 				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",
diff --git a/arch/arm64/boot/dts/vendor/bindings/thermal/qcom,devfreq-vdd-cdev.txt b/arch/arm64/boot/dts/vendor/bindings/thermal/qcom,devfreq-vdd-cdev.txt
new file mode 100644
index 000000000000..a3ff787cd185
--- /dev/null
+++ b/arch/arm64/boot/dts/vendor/bindings/thermal/qcom,devfreq-vdd-cdev.txt
@@ -0,0 +1,34 @@
+Qualcomm Technologies, Inc. Devfreq Vdd cooling device
+
+The Devfreq Vdd cooling device, will be used to set minimum
+operating level for gfx rail using gpu devfreq interface
+during cold thermal condition. This cooling device will be
+used with cold temp monitor thermal zone. Whenever cold
+temperature triggers, it disables frequencies lower than
+the minimum operating level using devfreq opp API's.
+
+Required Parameters:
+- compatible:
+	Usage: required
+	Value type: <string>
+	Definition: should be "qcom,devfreq-vdd-cooling-device"
+
+- devfreq:
+	Usage: required
+	Value type: <devfreq phandle>
+	Definition: Phandle to the GPU devfreq. This will register the GPU
+		devfreq as a cooling device with thermal framework.
+
+- #cooling-cells:
+	Usage: required
+	Value type: <integer>
+	Definition: Must be 2. This is required by of-thermal and refer the doc
+		<devicetree/bindings/thermal/thermal.txt> for more details.
+
+Example:
+
+	devfreq_vdd_cdev: devfreq-vdd-cdev {
+		compatible = "qcom,devfreq-vdd-cooling-device";
+		devfreq = <&msm_gpu>;
+		#cooling-cells = <2>;
+	};
diff --git a/arch/arm64/boot/dts/vendor/bindings/thermal/qti-qmi-cdev.txt b/arch/arm64/boot/dts/vendor/bindings/thermal/qti-qmi-cdev.txt
index d22547641936..de5011e56a60 100644
--- a/arch/arm64/boot/dts/vendor/bindings/thermal/qti-qmi-cdev.txt
+++ b/arch/arm64/boot/dts/vendor/bindings/thermal/qti-qmi-cdev.txt
@@ -73,6 +73,29 @@ Subsystem properties:
 						device,
 			"pa_dsc" -> DSC based pa cooling device,
 			"pa_fr1_dsc" -> DSC based pa cooling device.
+			"modem_lte_dsc" -> DSC based modem lte cooling device,
+			"modem_nr_dsc" -> DSC based modem nr cooling device,
+			"modem_nr_scg_dsc" -> DSC based modem nr scg cooling
+						device,
+			"sdr0_lte_dsc" -> DSC based sdr0 lte cooling device,
+			"sdr1_lte_dsc" -> DSC based sdr1 lte cooling device,
+			"sdr0_nr_dsc" -> DSC based sdr0 nr cooling device,
+			"sdr1_nr_dsc" -> DSC based sdr1 nr cooling device,
+			"pa_lte_sdr0_dsc" -> DSC based pa lte sdr0 cooling
+						device,
+			"pa_lte_sdr1_dsc" -> DSC based pa lte sdr1 cooling
+						device,
+			"pa_nr_sdr0_dsc" -> DSC based pa nr sdr0 cooling device,
+			"pa_nr_sdr1_dsc" -> DSC based pa nr sdr1 cooling device,
+			"pa_nr_sdr0_scg_dsc" -> DSC based pa nr sdr0 scg cooling
+						device,
+			"pa_nr_sdr1_scg_dsc" -> DSC based pa nr sdr1 scg cooling
+						device,
+			"mmw0_dsc" -> DSC based MMW cooling device0,
+			"mmw1_dsc" -> DSC based MMW cooling device1,
+			"mmw2_dsc" -> DSC based MMW cooling device2,
+			"mmw3_dsc" -> DSC based MMW cooling device3,
+			"mmw_ific_dsc" -> DSC based MMW IFIC cooling device.
 
 	-#cooling-cells:
 		Usage: required
diff --git a/arch/arm64/boot/dts/vendor/bindings/usb/qcom,dwc3.txt b/arch/arm64/boot/dts/vendor/bindings/usb/qcom,dwc3.txt
index cb695aa3fba4..9097f1fcadc4 100644
--- a/arch/arm64/boot/dts/vendor/bindings/usb/qcom,dwc3.txt
+++ b/arch/arm64/boot/dts/vendor/bindings/usb/qcom,dwc3.txt
@@ -46,6 +46,10 @@ Optional properties:
 - qcom,select-utmi-as-pipe-clk: if present, disable USB3 pipe_clk requirement.
 				Used when dwc3 operates without SSPHY and only
 				HS/FS/LS modes are supported.
+- qcom,iommu-best-fit-algo:	If present, enables best fit algorithm for iova
+				allocation. This helps in reducing fragmentation
+				and utilizing the iova address space more
+				efficiently.
 
 Required child node:
 A child node must exist to represent the core DWC3 IP block. The name of
diff --git a/arch/arm64/boot/dts/vendor/qcom/Makefile b/arch/arm64/boot/dts/vendor/qcom/Makefile
index 5e0161ebb276..cfe040cf7742 100644
--- a/arch/arm64/boot/dts/vendor/qcom/Makefile
+++ b/arch/arm64/boot/dts/vendor/qcom/Makefile
@@ -213,12 +213,16 @@ dtbo-$(CONFIG_ARCH_YUPIK) +=    \
 	yupikp-idps-amoled-overlay.dtbo \
 	yupikp-idp-hsp-overlay.dtbo \
 	yupik-iot-idp-overlay.dtbo \
+	yupik-iot-idp-pm7250b-overlay.dtbo \
 	yupik-iot-qrd-overlay.dtbo \
 	yupik-iot-hsp-overlay.dtbo \
+	yupik-iot-hsp-pm7250b-overlay.dtbo \
 	yupik-iot-idps-amoled-overlay.dtbo \
 	yupikp-iot-idp-overlay.dtbo \
+	yupikp-iot-idp-pm7250b-overlay.dtbo \
 	yupikp-iot-qrd-overlay.dtbo \
 	yupikp-iot-hsp-overlay.dtbo \
+	yupikp-iot-hsp-pm7250b-overlay.dtbo \
 	yupikp-iot-idps-amoled-overlay.dtbo
 
 
@@ -235,12 +239,16 @@ yupikp-qrd-overlay.dtbo-base := yupikp.dtb
 yupikp-idps-amoled-overlay.dtbo-base := yupikp.dtb
 yupikp-idp-hsp-overlay.dtbo-base := yupikp-hsp.dtb
 yupik-iot-idp-overlay.dtbo-base := yupik-iot.dtb
+yupik-iot-idp-pm7250b-overlay.dtbo-base := yupik-iot.dtb
 yupik-iot-qrd-overlay.dtbo-base := yupik-iot.dtb
 yupik-iot-hsp-overlay.dtbo-base := yupik-iot.dtb
+yupik-iot-hsp-pm7250b-overlay.dtbo-base := yupik-iot.dtb
 yupik-iot-idps-amoled-overlay.dtbo-base := yupik-iot.dtb
 yupikp-iot-idp-overlay.dtbo-base := yupikp-iot.dtb
+yupikp-iot-idp-pm7250b-overlay.dtbo-base := yupikp-iot.dtb
 yupikp-iot-qrd-overlay.dtbo-base := yupikp-iot.dtb
 yupikp-iot-hsp-overlay.dtbo-base := yupikp-iot.dtb
+yupikp-iot-hsp-pm7250b-overlay.dtbo-base := yupikp-iot.dtb
 yupikp-iot-idps-amoled-overlay.dtbo-base := yupikp-iot.dtb
 else
 dtb-$(CONFIG_ARCH_YUPIK) += yupik-rumi.dtb \
@@ -256,12 +264,16 @@ dtb-$(CONFIG_ARCH_YUPIK) += yupik-rumi.dtb \
 	yupikp-idps-amoled.dtb \
 	yupikp-idp-hsp.dtb \
 	yupik-iot-idp.dtb \
+	yupik-iot-idp-pm7250b.dtb \
 	yupik-iot-qrd.dtb \
 	yupik-iot-hsp.dtb \
 	yupik-iot-idps-amoled.dtb \
 	yupikp-iot-idp.dtb \
+	yupikp-iot-idp-pm7250b.dtb \
 	yupikp-iot-qrd.dtb \
 	yupikp-iot-hsp.dtb \
+	yupik-iot-hsp-pm7250b.dtb \
+	yupikp-iot-hsp-pm7250b.dtb \
 	yupikp-iot-idps-amoled.dtb
 endif
 
@@ -433,7 +445,17 @@ dtb-$(CONFIG_ARCH_SDXLEMUR) += sdxlemur-rumi.dtb \
 	sdxlemur-v2-mtp-mbb-pcie-ep-ipq.dtb \
 	sdxlemur-v2-mtp-mbb-pcie-rc-ep.dtb \
 	sdxlemur-v2-rcm-pcie-ep.dtb \
-	sdxlemur-v2-rcm-rc.dtb
+	sdxlemur-v2-rcm-rc.dtb \
+	sdxlemur-v2-atp.dtb \
+	sdxlemur-v2-mtp-cpe-pine1x.dtb \
+	sdxlemur-v2-mtp-cpe-pine2x.dtb \
+	sdxlemur-v2-mtp-mbb-emmc-512mb.dtb \
+	sdxlemur-v2-mtp-mbb-m2-ep-usb.dtb \
+	sdxlemur-v2-mtp-mbb-m2-ep.dtb \
+	sdxlemur-v2-rcm-rc-pine1x.dtb \
+	sdxlemur-v2-rcm-rc-pine2x.dtb \
+	sdxlemur-v2-m2-ep-fwa.dtb
+
 
 
 ifeq ($(CONFIG_ARCH_SHIMA), y)
diff --git a/arch/arm64/boot/dts/vendor/qcom/blair-atp.dtsi b/arch/arm64/boot/dts/vendor/qcom/blair-atp.dtsi
index f0e0e0cab6be..4f1257eed568 100644
--- a/arch/arm64/boot/dts/vendor/qcom/blair-atp.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/blair-atp.dtsi
@@ -347,10 +347,6 @@
 		regulator-s3-level-ao {
 			status = "okay";
 		};
-
-		gfx-cdev {
-			status = "okay";
-		};
 	};
 
 	/* Enable mx_cdev for PM6350 */
diff --git a/arch/arm64/boot/dts/vendor/qcom/blair-cdp.dtsi b/arch/arm64/boot/dts/vendor/qcom/blair-cdp.dtsi
index 3a04bd70fe5f..25a18cd8d133 100644
--- a/arch/arm64/boot/dts/vendor/qcom/blair-cdp.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/blair-cdp.dtsi
@@ -261,7 +261,7 @@
 	#address-cells = <1>;
 	#size-cells = <0>;
 	status = "okay";
-	qcom,i2c-touch-active="synaptics,tcm-i2c";
+	qcom,i2c-touch-active= "synaptics,tcm-i2c";
 
 	synaptics_tcm@20 {
 		compatible = "synaptics,tcm-i2c";
@@ -309,6 +309,9 @@
 		pinctrl-0 = <&ts_active>;
 		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
 		pinctrl-2 = <&pmx_ts_release>;
+
+		panel = <&dsi_r66451_amoled_cmd
+			&dsi_r66451_amoled_video>;
 	};
 
 	novatek@62 {
diff --git a/arch/arm64/boot/dts/vendor/qcom/blair-pinctrl.dtsi b/arch/arm64/boot/dts/vendor/qcom/blair-pinctrl.dtsi
index 1302fa7d9dec..56d861ad5b31 100644
--- a/arch/arm64/boot/dts/vendor/qcom/blair-pinctrl.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/blair-pinctrl.dtsi
@@ -337,7 +337,7 @@
 			qupv3_se7_i2c_active: qupv3_se7_i2c_active {
 				mux {
 					pins = "gpio27", "gpio28";
-					function = "qup11";
+					function = "qup11_f1";
 				};
 
 				config {
diff --git a/arch/arm64/boot/dts/vendor/qcom/blair.dtsi b/arch/arm64/boot/dts/vendor/qcom/blair.dtsi
index ea1fbcdd046c..b16c64f920a6 100644
--- a/arch/arm64/boot/dts/vendor/qcom/blair.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/blair.dtsi
@@ -63,6 +63,7 @@
 			device_type = "cpu";
 			compatible = "qcom,kryo";
 			reg = <0x0 0x0>;
+			cpu-idle-states = <&SLVR_PC &SLVR_RAIL_OFF>;
 			enable-method = "psci";
 			capacity-dmips-mhz = <1024>;
 			dynamic-power-coefficient = <100>;
@@ -86,6 +87,7 @@
 			device_type = "cpu";
 			compatible = "qcom,kryo";
 			reg = <0x0 0x100>;
+			cpu-idle-states = <&SLVR_PC &SLVR_RAIL_OFF>;
 			enable-method = "psci";
 			capacity-dmips-mhz = <1024>;
 			dynamic-power-coefficient = <100>;
@@ -103,6 +105,7 @@
 			device_type = "cpu";
 			compatible = "qcom,kryo";
 			reg = <0x0 0x200>;
+			cpu-idle-states = <&SLVR_PC &SLVR_RAIL_OFF>;
 			enable-method = "psci";
 			capacity-dmips-mhz = <1024>;
 			dynamic-power-coefficient = <100>;
@@ -120,6 +123,7 @@
 			device_type = "cpu";
 			compatible = "qcom,kryo";
 			reg = <0x0 0x300>;
+			cpu-idle-states = <&SLVR_PC &SLVR_RAIL_OFF>;
 			enable-method = "psci";
 			capacity-dmips-mhz = <1024>;
 			dynamic-power-coefficient = <100>;
@@ -138,6 +142,7 @@
 			compatible = "qcom,kryo";
 			reg = <0x0 0x400>;
 			enable-method = "psci";
+			cpu-idle-states = <&SLVR_PC &SLVR_RAIL_OFF>;
 			capacity-dmips-mhz = <1024>;
 			dynamic-power-coefficient = <100>;
 			cpu-release-addr = <0x0 0x50000000>;
@@ -155,6 +160,7 @@
 			compatible = "qcom,kryo";
 			reg = <0x0 0x500>;
 			enable-method = "psci";
+			cpu-idle-states = <&SLVR_PC &SLVR_RAIL_OFF>;
 			capacity-dmips-mhz = <1024>;
 			dynamic-power-coefficient = <100>;
 			cpu-release-addr = <0x0 0x50000000>;
@@ -171,6 +177,7 @@
 			device_type = "cpu";
 			compatible = "qcom,kryo";
 			reg = <0x0 0x600>;
+			cpu-idle-states = <&GOLD_PC &GOLD_RAIL_OFF>;
 			enable-method = "psci";
 			capacity-dmips-mhz = <1946>;
 			dynamic-power-coefficient = <520>;
@@ -189,6 +196,7 @@
 			device_type = "cpu";
 			compatible = "qcom,kryo";
 			reg = <0x0 0x700>;
+			cpu-idle-states = <&GOLD_PC &GOLD_RAIL_OFF>;
 			enable-method = "psci";
 			capacity-dmips-mhz = <1946>;
 			dynamic-power-coefficient = <520>;
diff --git a/arch/arm64/boot/dts/vendor/qcom/direwolf-vm-audio.dtsi b/arch/arm64/boot/dts/vendor/qcom/direwolf-vm-audio.dtsi
index b19586acd6d7..97daaaacacf7 100644
--- a/arch/arm64/boot/dts/vendor/qcom/direwolf-vm-audio.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/direwolf-vm-audio.dtsi
@@ -1089,9 +1089,12 @@
 				"msm-pcm-dsp-noirq", "msm-pcm-loopback.1",
 				"msm-pcm-dtmf";
 		asoc-cpu = <&dai_hdmi>, <&dai_dp>,
-				<&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_mi2s4>, <&dai_pri_auxpcm>,
+				<&dai_mi2s0_rx>, <&dai_mi2s0_tx>,
+				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,
+				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,
+				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,
+				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,
+				<&dai_pri_auxpcm>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
 				<&afe_pcm_rx>, <&afe_pcm_tx>,
@@ -1167,7 +1170,10 @@
 		asoc-cpu-names = "msm-dai-q6-hdmi.8",  "msm-dai-q6-dp.0",
 				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
 				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
-				"msm-dai-q6-mi2s.4", "msm-dai-q6-auxpcm.1",
+				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",
+				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",
+				"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",
+				"msm-dai-q6-auxpcm.1",
 				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",
 				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",
 				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",
diff --git a/arch/arm64/boot/dts/vendor/qcom/holi-audio.dtsi b/arch/arm64/boot/dts/vendor/qcom/holi-audio.dtsi
index 4014574b45ee..8b6226720ac4 100644
--- a/arch/arm64/boot/dts/vendor/qcom/holi-audio.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/holi-audio.dtsi
@@ -34,7 +34,7 @@
 					      <0x00008000>, <0x00009000>,
 					      <0x0000A000>, <0x0000B000>,
 					      <0x0000C000>, <0x0000D000>,
-					      <0x0000E000>, <0x0000F0000>,
+					      <0x0000E000>, <0x0000F000>,
 					      <0x00010000>, <0x00011000>,
 					      <0x00012000>;
 			qcom,lpi-slew-offset-tbl = <0x00000000>, <0x00000002>,
@@ -153,8 +153,10 @@
 				"msm-pcm-afe", "msm-lsm-client",
 				"msm-pcm-routing", "msm-compr-dsp",
 				"msm-pcm-dsp-noirq";
-		asoc-cpu = <&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
+		asoc-cpu = <&dai_mi2s0_rx>, <&dai_mi2s0_tx>,
+				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,
+				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,
+				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,
 				<&dai_pri_auxpcm>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>,
@@ -181,6 +183,8 @@
 				<&rx_cdc_dma_7_rx>,<&afe_loopback_tx>;
 		asoc-cpu-names = "msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
 				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
+				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",
+				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",
 				"msm-dai-q6-auxpcm.1",
 				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",
 				"msm-dai-q6-auxpcm.4",
diff --git a/arch/arm64/boot/dts/vendor/qcom/holi-pmic-overlay-pm6125.dtsi b/arch/arm64/boot/dts/vendor/qcom/holi-pmic-overlay-pm6125.dtsi
index cf4d9588b4c1..1e7a198c34a1 100644
--- a/arch/arm64/boot/dts/vendor/qcom/holi-pmic-overlay-pm6125.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/holi-pmic-overlay-pm6125.dtsi
@@ -494,3 +494,6 @@
 	};
 };
 
+&pm6125_pon {
+	qcom,log-kpd-event;
+};
diff --git a/arch/arm64/boot/dts/vendor/qcom/holi-regulators-pm6125.dtsi b/arch/arm64/boot/dts/vendor/qcom/holi-regulators-pm6125.dtsi
index 652065155f87..e5f25c6397f4 100644
--- a/arch/arm64/boot/dts/vendor/qcom/holi-regulators-pm6125.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/holi-regulators-pm6125.dtsi
@@ -74,10 +74,6 @@
 		regulator-s3-level-ao {
 			status = "disabled";
 		};
-
-		gfx-cdev {
-			status = "disabled";
-		};
 	};
 
 	/* Disable mx_cdev for PM6150A */
@@ -434,16 +430,6 @@
 					<RPM_SMD_REGULATOR_LEVEL_BINNING>;
 			qcom,use-voltage-level;
 		};
-
-		gfx_cdev: gfx-cdev {
-			status = "okay";
-			compatible = "qcom,regulator-cooling-device";
-			regulator-cdev-supply = <&S8A_LEVEL_AO>;
-			regulator-levels = <RPM_SMD_REGULATOR_LEVEL_NONE
-					RPM_SMD_REGULATOR_LEVEL_SVS_PLUS>;
-			#cooling-cells = <2>;
-		};
-
 	};
 
 	/* VDD_LPI_CX supply */
diff --git a/arch/arm64/boot/dts/vendor/qcom/holi-regulators-pm6350.dtsi b/arch/arm64/boot/dts/vendor/qcom/holi-regulators-pm6350.dtsi
index 179cd8900a8f..c0679f636d22 100644
--- a/arch/arm64/boot/dts/vendor/qcom/holi-regulators-pm6350.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/holi-regulators-pm6350.dtsi
@@ -50,14 +50,6 @@
 					<RPM_SMD_REGULATOR_LEVEL_BINNING>;
 			qcom,use-voltage-level;
 		};
-
-		gfx_cdev: gfx-cdev {
-			compatible = "qcom,regulator-cooling-device";
-			regulator-cdev-supply = <&S3A_LEVEL_AO>;
-			regulator-levels = <RPM_SMD_REGULATOR_LEVEL_RETENTION
-					RPM_SMD_REGULATOR_LEVEL_SVS_PLUS>;
-			#cooling-cells = <2>;
-		};
 	};
 
 	/* PM6350 L1 - VDD_MX supply */
diff --git a/arch/arm64/boot/dts/vendor/qcom/holi-thermal.dtsi b/arch/arm64/boot/dts/vendor/qcom/holi-thermal.dtsi
index 958f6b7d74b7..2ba52043e83f 100644
--- a/arch/arm64/boot/dts/vendor/qcom/holi-thermal.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/holi-thermal.dtsi
@@ -72,6 +72,12 @@
 		#cooling-cells = <2>;
 		status = "disabled";
 	};
+
+	devfreq_vdd_cdev: devfreq-vdd-cdev {
+		compatible = "qcom,devfreq-vdd-cooling-device";
+		devfreq = <&msm_gpu>;
+		#cooling-cells = <2>;
+	};
 };
 
 &rpm_bus {
@@ -1167,9 +1173,9 @@
 				cooling-device = <&mx_cdev 1 1>;
 			};
 
-			gfx_vdd_cdev {
+			devfreq_vdd_cdev {
 				trip = <&zeroc_0_trip>;
-				cooling-device = <&gfx_cdev 1 1>;
+				cooling-device = <&devfreq_vdd_cdev 2 2>;
 			};
 
 			adsp_vdd_cdev {
@@ -1214,9 +1220,9 @@
 				cooling-device = <&mx_cdev 1 1>;
 			};
 
-			gfx_vdd_cdev {
+			devfreq_vdd_cdev {
 				trip = <&zeroc_1_trip>;
-				cooling-device = <&gfx_cdev 1 1>;
+				cooling-device = <&devfreq_vdd_cdev 2 2>;
 			};
 
 			adsp_vdd_cdev {
diff --git a/arch/arm64/boot/dts/vendor/qcom/lahaina-pm.dtsi b/arch/arm64/boot/dts/vendor/qcom/lahaina-pm.dtsi
index 7ed8f6961ada..1918104a5fd2 100644
--- a/arch/arm64/boot/dts/vendor/qcom/lahaina-pm.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/lahaina-pm.dtsi
@@ -130,6 +130,11 @@
 		reg = <0xb221200 0x60>;
 	};
 
+	subsystem-sleep-stats {
+		compatible = "qcom,subsystem-sleep-stats";
+		reg = <0xc3f0000 0x400>;
+	};
+
 	soc-sleep-stats@c3f0000 {
 		compatible = "qcom,rpmh-sleep-stats";
 		reg = <0xc3f0000 0x400>;
diff --git a/arch/arm64/boot/dts/vendor/qcom/lahaina.dtsi b/arch/arm64/boot/dts/vendor/qcom/lahaina.dtsi
index c940fa425421..d0f145fe829f 100644
--- a/arch/arm64/boot/dts/vendor/qcom/lahaina.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/lahaina.dtsi
@@ -4665,6 +4665,7 @@
 		qcom,ipa-holb-monitor-max-cnt-11ad = <10>;
 		qcom,tx-wrapper-cache-max-size = <400>;
 		qcom,ipa-gpi-event-rp-ddr;
+		qcom,register-collection-on-crash;
 		clock-names = "core_clk";
 		clocks = <&clock_rpmh RPMH_IPA_CLK>;
 		qcom,interconnect,num-cases = <5>;
diff --git a/arch/arm64/boot/dts/vendor/qcom/pm6125.dtsi b/arch/arm64/boot/dts/vendor/qcom/pm6125.dtsi
index 28ac8c196c2e..fb71fa0fd284 100644
--- a/arch/arm64/boot/dts/vendor/qcom/pm6125.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/pm6125.dtsi
@@ -17,7 +17,7 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		qcom,power-on@800 {
+		pm6125_pon: qcom,power-on@800 {
 			compatible = "qcom,qpnp-power-on";
 			reg = <0x800>;
 			interrupts = <0x0 0x8 0x0 IRQ_TYPE_EDGE_BOTH>,
diff --git a/arch/arm64/boot/dts/vendor/qcom/sa6155-audio.dtsi b/arch/arm64/boot/dts/vendor/qcom/sa6155-audio.dtsi
index 8e1aa63d8e9f..dc01de783b2b 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sa6155-audio.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/sa6155-audio.dtsi
@@ -517,9 +517,12 @@ qcom,msm-dai-q6 {
 				"msm-pcm-dsp-noirq", "msm-pcm-loopback.1",
 				"msm-pcm-dtmf";
 		asoc-cpu = <&dai_hdmi>, <&dai_dp>,
-				<&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_mi2s4>, <&dai_pri_auxpcm>,
+				<&dai_mi2s0_rx>, <&dai_mi2s0_tx>,
+				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,
+				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,
+				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,
+				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,
+				<&dai_pri_auxpcm>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
 				<&afe_pcm_rx>, <&afe_pcm_tx>,
@@ -553,9 +556,11 @@ qcom,msm-dai-q6 {
 				<&dai_quin_tdm_tx_2>, <&dai_quin_tdm_tx_3>,
 				<&dai_quin_tdm_tx_7>;
 		asoc-cpu-names = "msm-dai-q6-hdmi.8",  "msm-dai-q6-dp.0",
-				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
-				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
-				"msm-dai-q6-mi2s.4", "msm-dai-q6-auxpcm.1",
+				"msm-dai-q6-mi2s.1", "msm-dai-q6-mi2s.2",
+				"msm-dai-q6-mi2s.3", "msm-dai-q6-mi2s.4",
+				"msm-dai-q6-mi2s.5", "msm-dai-q6-mi2s.6",
+				"msm-dai-q6-mi2s.7", "msm-dai-q6-mi2s.8",
+				"msm-dai-q6-mi2s.9", "msm-dai-q6-auxpcm.1",
 				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",
 				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",
 				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",
diff --git a/arch/arm64/boot/dts/vendor/qcom/sa8155-audio.dtsi b/arch/arm64/boot/dts/vendor/qcom/sa8155-audio.dtsi
index e93ab89508e5..fc606616f3ec 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sa8155-audio.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/sa8155-audio.dtsi
@@ -513,9 +513,12 @@ qcom,msm-dai-q6 {
 				"msm-pcm-dsp-noirq", "msm-pcm-loopback.1",
 				"msm-pcm-dtmf";
 		asoc-cpu = <&dai_hdmi>, <&dai_dp>,
-				<&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_mi2s4>, <&dai_pri_auxpcm>,
+				<&dai_mi2s0_rx>, <&dai_mi2s0_tx>,
+				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,
+				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,
+				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,
+				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,
+				<&dai_pri_auxpcm>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
 				<&afe_pcm_rx>, <&afe_pcm_tx>,
@@ -549,9 +552,11 @@ qcom,msm-dai-q6 {
 				<&dai_quin_tdm_tx_2>, <&dai_quin_tdm_tx_3>,
 				<&dai_quin_tdm_tx_7>;
 		asoc-cpu-names = "msm-dai-q6-hdmi.8",  "msm-dai-q6-dp.0",
-				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
-				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
-				"msm-dai-q6-mi2s.4", "msm-dai-q6-auxpcm.1",
+				"msm-dai-q6-mi2s.1", "msm-dai-q6-mi2s.2",
+				"msm-dai-q6-mi2s.3", "msm-dai-q6-mi2s.4",
+				"msm-dai-q6-mi2s.5", "msm-dai-q6-mi2s.6",
+				"msm-dai-q6-mi2s.7", "msm-dai-q6-mi2s.8",
+				"msm-dai-q6-mi2s.9", "msm-dai-q6-auxpcm.1",
 				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",
 				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",
 				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",
diff --git a/arch/arm64/boot/dts/vendor/qcom/sa8155-vm-audio.dtsi b/arch/arm64/boot/dts/vendor/qcom/sa8155-vm-audio.dtsi
index 0db1f18be5a0..1b2feda9b10d 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sa8155-vm-audio.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/sa8155-vm-audio.dtsi
@@ -469,9 +469,12 @@
 				"msm-pcm-dsp-noirq", "msm-pcm-loopback.1",
 				"msm-pcm-dtmf";
 		asoc-cpu = <&dai_hdmi>, <&dai_dp>,
-				<&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_mi2s4>, <&dai_pri_auxpcm>,
+				<&dai_mi2s0_rx>, <&dai_mi2s0_tx>,
+				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,
+				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,
+				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,
+				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,
+				<&dai_pri_auxpcm>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
 				<&afe_pcm_rx>, <&afe_pcm_tx>,
@@ -505,9 +508,11 @@
 				<&dai_quin_tdm_tx_2>, <&dai_quin_tdm_tx_3>,
 				<&dai_quin_tdm_tx_7>;
 		asoc-cpu-names = "msm-dai-q6-hdmi.8",  "msm-dai-q6-dp.0",
-				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
-				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
-				"msm-dai-q6-mi2s.4", "msm-dai-q6-auxpcm.1",
+				"msm-dai-q6-mi2s.1", "msm-dai-q6-mi2s.2",
+				"msm-dai-q6-mi2s.3", "msm-dai-q6-mi2s.4",
+				"msm-dai-q6-mi2s.5", "msm-dai-q6-mi2s.6",
+				"msm-dai-q6-mi2s.7", "msm-dai-q6-mi2s.8",
+				"msm-dai-q6-mi2s.9", "msm-dai-q6-auxpcm.1",
 				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",
 				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",
 				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",
diff --git a/arch/arm64/boot/dts/vendor/qcom/scuba-audio.dtsi b/arch/arm64/boot/dts/vendor/qcom/scuba-audio.dtsi
index bd1b4870f5e7..3413dfeaa15a 100644
--- a/arch/arm64/boot/dts/vendor/qcom/scuba-audio.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/scuba-audio.dtsi
@@ -100,8 +100,10 @@
 				"msm-pcm-afe", "msm-lsm-client",
 				"msm-pcm-routing", "msm-compr-dsp",
 				"msm-pcm-dsp-noirq";
-		asoc-cpu = <&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
+		asoc-cpu = <&dai_mi2s0_rx>, <&dai_mi2s0_tx>,
+				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,
+				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,
+				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,
 				<&dai_pri_auxpcm>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>,
@@ -128,6 +130,8 @@
 				<&afe_loopback_tx>;
 		asoc-cpu-names = "msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
 				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
+				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",
+				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",
 				"msm-dai-q6-auxpcm.1",
 				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",
 				"msm-dai-q6-auxpcm.4", "msm-dai-q6-dev.224",
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-bluetooth.dtsi b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-bluetooth.dtsi
index 600583f15bb3..e8dccf6a6089 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-bluetooth.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-bluetooth.dtsi
@@ -19,7 +19,6 @@
 		pinctrl-names = "default";
 		pinctrl-0 = <&bt_en_default>;
 		qcom,bt-reset-gpio = <&pmx65_gpios 15 0>; /* BT_EN */
-		qcom,bt-sw-ctrl-gpio = <&pmx65_gpios 2 0>; /* SW_CTRL */
 
 		clocks = <&rpmhcc RPMH_RF_CLK3>;
 		clock-names = "ref3_clk";
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-cnss.dtsi b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-cnss.dtsi
index 8b2973d86491..469c03a51321 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-cnss.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-cnss.dtsi
@@ -30,6 +30,7 @@
 
 		use-pm-domain;
 		cnss-enable-self-recovery;
+		default_gen_speed = <0>;
 
 		vdd-wlan-aon-supply = <&S7B>;
 		qcom,vdd-wlan-aon-config = <1012000 1012000 0 0 0>;
@@ -169,12 +170,7 @@
 			};
 
 			mhi_event@2 {
-				mhi,num-elements = <32>;
-				mhi,intmod = <0>;
-				mhi,msi = <0>;
-				mhi,priority = <2>;
-				mhi,brstmode = <2>;
-				mhi,data-type = <3>;
+				status = "disabled";
 			};
 		};
 
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe-hsp.dtsi b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe-hsp.dtsi
index d9969be2f7be..e8ba2208d897 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe-hsp.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe-hsp.dtsi
@@ -14,28 +14,3 @@
 		#size-cells = <1>;
 	};
 };
-
-&wlan {
-	mhi_events {
-		mhi_event@0 {
-			mhi,num-elements = <32>;
-			mhi,intmod = <0>;
-			mhi,msi = <1>;
-			mhi,priority = <0>;
-			mhi,brstmode = <2>;
-			mhi,data-type = <1>;
-		};
-
-		mhi_event@1 {
-			mhi,num-elements = <256>;
-			mhi,intmod = <0>;
-			mhi,msi = <2>;
-			mhi,priority = <1>;
-			mhi,brstmode = <2>;
-		};
-
-		mhi_event@2 {
-			status = "disabled";
-		};
-	};
-};
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe-pine1x.dts b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe-pine1x.dts
index 641531bb3ea2..7fa9d4a9e077 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe-pine1x.dts
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe-pine1x.dts
@@ -4,6 +4,7 @@
 #include "sdxlemur-mtp-cpe.dtsi"
 #include "sdxlemur-mtp-cpe-pine1x.dtsi"
 #include "sdxlemur-1024mb.dtsi"
+#include "sdxlemur-bluetooth.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SDXLEMUR MTP CPE 1x Pine";
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe-pine1x.dtsi b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe-pine1x.dtsi
index 4f653deecd4d..305877ccd276 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe-pine1x.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe-pine1x.dtsi
@@ -13,7 +13,7 @@
 	};
 };
 
-&ntn3_vreg {
+&qps615_vreg {
 	vin-supply = <&pine_vreg>;
 };
 
@@ -29,7 +29,7 @@
 		reg = <0 0 0 0 0>;
 		qcom,iommu-group = <&qcn9000_pci_iommu_group_0>;
 		memory-region = <&qcn9000_0_mem>;
-		qrtr_instance_id = <0x0>;
+		qrtr_instance_id = <0x20>;
 
 		#address-cells = <1>;
 		#size-cells = <1>;
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe-pine2x.dts b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe-pine2x.dts
index e8a4eaa2005a..705c9b4cb1dd 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe-pine2x.dts
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe-pine2x.dts
@@ -4,6 +4,7 @@
 #include "sdxlemur-mtp-cpe.dtsi"
 #include "sdxlemur-mtp-cpe-pine2x.dtsi"
 #include "sdxlemur-1024mb.dtsi"
+#include "sdxlemur-bluetooth.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SDXLEMUR MTP CPE 2x Pine";
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe-pine2x.dtsi b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe-pine2x.dtsi
index a7373e1f2622..2fc2b95bc75d 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe-pine2x.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe-pine2x.dtsi
@@ -1,4 +1,82 @@
+#include "sdxlemur-qcn9000.dtsi"
 
 &soc {
-
+	pine_vreg: pine_vreg {
+		compatible = "regulator-fixed";
+		regulator-name = "pine_vreg";
+		gpio = <&tlmm 102 GPIO_ACTIVE_HIGH>;
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		enable-active-high;
+		regulator-enable-ramp-delay = <200000>;
+	};
+};
+
+&qps615_vreg {
+	vin-supply = <&pine_vreg>;
+};
+
+&pcie_i2c_ctrl {
+	reg_update = <0x82c030 0x1
+			0x828000 0x3
+			0x82bd00 0x8
+			0x82c030 0x2
+			0x828000 0x3
+			0x82bd00 0x8
+			0x82c030 0x8
+			0x828000 0x1
+			0x82bd00 0x8
+			0x82c01c 0x10
+			0x82c030 0xf
+			0x828000 0xf
+			0x82b268 0x2>;
+};
+
+&pcie0 {
+	qcom,no-l0s-supported;
+	qcom,no-l1-supported;
+	qcom,no-l1ss-supported;
+	qcom,no-aux-clk-sync;
+};
+
+&pcie0_bus2_dev1_fn0 {
+	cnss_pci1: cnss_pci1 {
+		reg = <0 0 0 0 0>;
+		qcom,iommu-group = <&qcn9000_pci_iommu_group_0>;
+		memory-region = <&qcn9000_0_mem>;
+		qrtr_instance_id = <0x20>;
+
+		#address-cells = <1>;
+		#size-cells = <1>;
+	};
+};
+
+&pcie0_bus2_dev2_fn0 {
+	cnss_pci2: cnss_pci2 {
+		reg = <0 0 0 0 0>;
+		qcom,iommu-group = <&qcn9000_pci_iommu_group_1>;
+		memory-region = <&qcn9000_1_mem>;
+		qrtr_instance_id = <0x21>;
+
+		#address-cells = <1>;
+		#size-cells = <1>;
+	};
+};
+
+&wifi0 {
+	status = "ok";
+	board_id = <0xa0>;
+};
+
+&wifi1 {
+	status = "ok";
+	board_id = <0xa1>;
+};
+
+&qcn9000_0_mem {
+	status = "ok";
+};
+
+&qcn9000_1_mem {
+	status = "ok";
 };
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe.dts b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe.dts
index 3942c230e2bd..3c8c9ad3028b 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe.dts
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe.dts
@@ -6,6 +6,7 @@
 #include "sdxlemur-1024mb-cpe.dtsi"
 #include "sdxlemur-audio.dtsi"
 #include "sdxlemur-mtp-audio-overlay.dtsi"
+#include "sdxlemur-bluetooth.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SDXLEMUR MTP CPE";
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe.dtsi b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe.dtsi
index 266d6df33c5c..dde1e97716da 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-cpe.dtsi
@@ -1,9 +1,9 @@
 #include "sdxlemur-mtp.dtsi"
 
 &soc {
-	ntn3_vreg: ntn3_vreg {
+	qps615_vreg: qps615_vreg {
 		compatible = "regulator-fixed";
-		regulator-name = "ntn3_vreg";
+		regulator-name = "qps615_vreg";
 		gpio = <&tlmm 107 GPIO_ACTIVE_HIGH>;
 		regulator-min-microvolt = <1000000>;
 		regulator-max-microvolt = <1000000>;
@@ -15,29 +15,29 @@
 		compatible = "regulator-fixed";
 		regulator-name = "qca_vreg";
 		gpio = <&tlmm 106 GPIO_ACTIVE_HIGH>;
-		vin-supply = <&ntn3_vreg>;
+		vin-supply = <&qps615_vreg>;
 		regulator-min-microvolt = <1800000>;
 		regulator-max-microvolt = <1800000>;
 		enable-active-high;
-		regulator-enable-ramp-delay = <200000>;
+		regulator-enable-ramp-delay = <80000>;
 	};
 
 	aqr_vreg: aqr_vreg {
 		compatible = "regulator-fixed";
 		regulator-name = "aqr_vreg";
 		gpio = <&tlmm 105 GPIO_ACTIVE_HIGH>;
-		vin-supply = <&qca_vreg>;
+		vin-supply = <&qps615_vreg>;
 		regulator-min-microvolt = <1000000>;
 		regulator-max-microvolt = <1000000>;
 		enable-active-high;
-		regulator-enable-ramp-delay = <2400>;
+		regulator-enable-ramp-delay = <10000>;
 	};
 
-	ioss_qps615_rx: qps615_rx@eth {
+	ioss_aqr_rx: qps615_rx@eth0 {
 		qcom,dir-rx;
 		qcom,rx-filter-ip;
 
-		qcom,ring-size = <128>;
+		qcom,ring-size = <1023>;
 		qcom,buff-size = <2048>;
 
 		qcom,mod-count-min = <64>;
@@ -46,9 +46,9 @@
 		qcom,mod-usecs-max = <60>;
 	};
 
-	ioss_qps615_tx: qps615_tx@eth {
+	ioss_aqr_tx: qps615_tx@eth0 {
 		qcom,dir-tx;
-		qcom,ring-size = <512>;
+		qcom,ring-size = <1023>;
 		qcom,buff-size = <2048>;
 
 		qcom,mod-count-min = <64>;
@@ -57,22 +57,28 @@
 		qcom,mod-usecs-max = <60>;
 	};
 
-	ioss_qps615_eth0: qps615@eth0 {
-		qcom,name = "eth0";
-		qcom,ioss_instance = <0>;
+	ioss_napa_rx: qps615_rx@eth1 {
+		qcom,dir-rx;
+		qcom,rx-filter-ip;
 
-		qcom,ioss_channels =
-			<&ioss_qps615_rx>,
-			<&ioss_qps615_tx>;
+		qcom,ring-size = <127>;
+		qcom,buff-size = <2048>;
+
+		qcom,mod-count-min = <64>;
+		qcom,mod-count-max = <64>;
+		qcom,mod-usecs-min = <30>;
+		qcom,mod-usecs-max = <60>;
 	};
 
-	ioss_qps615_eth1: qps615@eth1 {
-		qcom,name = "eth1";
-		qcom,ioss_instance = <0>;
+	ioss_napa_tx: qps615_tx@eth1 {
+		qcom,dir-tx;
+		qcom,ring-size = <511>;
+		qcom,buff-size = <2048>;
 
-		qcom,ioss_channels =
-			<&ioss_qps615_rx>,
-			<&ioss_qps615_tx>;
+		qcom,mod-count-min = <64>;
+		qcom,mod-count-max = <64>;
+		qcom,mod-usecs-min = <30>;
+		qcom,mod-usecs-max = <60>;
 	};
 };
 
@@ -84,7 +90,7 @@
 		reg = <0x77>;
 		gpio-config-reg = <0x801208>;
 		ep-reset-reg = <0x801210>;
-		ep-reset-gpio-mask = <0xf>;
+		ep-reset-gpio-mask = <0xc>;
 		dump-regs = <0x801330 0x801350 0x801370>;
 		reg_update = <0x82c030 0x1
 					0x828000 0x3
@@ -94,7 +100,13 @@
 					0x82bd00 0x8
 					0x82c030 0x8
 					0x828000 0x1
-					0x82bd00 0x8>;
+					0x82bd00 0x8
+					0x82c01c 0x10
+					0x82c030 0xf
+					0x828000 0xf
+					0x82b268 0x2
+					0x82C02C 0x4
+					0x8249DC 0x0>;
 	};
 };
 
@@ -102,7 +114,158 @@
 &pcie0 {
 	pcie-i2c-phandle = <&i2c_5>;
 
-	vreg-3p3-supply = <&aqr_vreg>;
+	vreg-3p3-supply = <&qps615_vreg>;
+	qcom,phy-sequence = <0x1240 0x03 0x0
+				0x1010 0x01 0x0
+				0x101c 0x31 0x0
+				0x1020 0x01 0x0
+				0x1024 0xde 0x0
+				0x1028 0x07 0x0
+				0x1030 0x97 0x0
+				0x1034 0x0c 0x0
+				0x1044 0x14 0x0
+				0x1048 0x90 0x0
+				0x1058 0x0f 0x0
+				0x1074 0x06 0x0
+				0x1078 0x06 0x0
+				0x107c 0x16 0x0
+				0x1080 0x16 0x0
+				0x1084 0x36 0x0
+				0x1088 0x36 0x0
+				0x1094 0x08 0x0
+				0x10a4 0x46 0x0
+				0x10a8 0x04 0x0
+				0x10ac 0x0a 0x0
+				0x10b0 0x1a 0x0
+				0x10b4 0x14 0x0
+				0x10b8 0x34 0x0
+				0x10bc 0x82 0x0
+				0x10c4 0xd0 0x0
+				0x10cc 0x55 0x0
+				0x10d0 0x55 0x0
+				0x10d4 0x03 0x0
+				0x10d8 0x55 0x0
+				0x10dc 0x55 0x0
+				0x10e0 0x05 0x0
+				0x110c 0x02 0x0
+				0x1154 0x34 0x0
+				0x1158 0x12 0x0
+				0x115c 0x00 0x0
+				0x1168 0x0a 0x0
+				0x116c 0x04 0x0
+				0x119c 0x88 0x0
+				0x1174 0x60 0x0
+				0x117c 0x06 0x0
+				0x11a0 0x14 0x0
+				0x11a8 0x0f 0x0
+				0x0220 0x16 0x0
+				0x03c0 0x38 0x0
+				0x0a20 0x16 0x0
+				0x0bc0 0x38 0x0
+				0x0364 0xcc 0x0
+				0x0368 0x12 0x0
+				0x036c 0xcc 0x0
+				0x0374 0x4a 0x0
+				0x0378 0x29 0x0
+				0x037c 0xc5 0x0
+				0x0380 0xac 0x0
+				0x0384 0xb6 0x0
+				0x0388 0xc0 0x0
+				0x038c 0x07 0x0
+				0x0390 0xfb 0x0
+				0x0394 0x0d 0x0
+				0x0398 0xc5 0x0
+				0x039c 0xee 0x0
+				0x03a0 0xbf 0x0
+				0x03a4 0xa0 0x0
+				0x03a8 0x81 0x0
+				0x03ac 0xde 0x0
+				0x03b0 0x7f 0x0
+				0x0b64 0xcc 0x0
+				0x0b68 0x12 0x0
+				0x0b6c 0xcc 0x0
+				0x0b74 0x4a 0x0
+				0x0b78 0x29 0x0
+				0x0b7c 0xc5 0x0
+				0x0b80 0xac 0x0
+				0x0b84 0xb6 0x0
+				0x0b88 0xc0 0x0
+				0x0b8c 0x07 0x0
+				0x0b90 0xfb 0x0
+				0x0b94 0x0d 0x0
+				0x0b98 0xc5 0x0
+				0x0b9c 0xee 0x0
+				0x0ba0 0xbf 0x0
+				0x0ba4 0xa0 0x0
+				0x0ba8 0x81 0x0
+				0x0bac 0xde 0x0
+				0x0bb0 0x7f 0x0
+				0x03b4 0x20 0x0
+				0x022c 0x3f 0x0
+				0x0230 0x37 0x0
+				0x0bb4 0x20 0x0
+				0x0a2c 0x3f 0x0
+				0x0a30 0x37 0x0
+				0x0078 0x05 0x0
+				0x007c 0xf6 0x0
+				0x0878 0x05 0x0
+				0x087c 0xf6 0x0
+				0x0290 0x05 0x0
+				0x0a90 0x05 0x0
+				0x03f8 0x1f 0x0
+				0x0400 0x1f 0x0
+				0x0408 0x1f 0x0
+				0x0410 0x1f 0x0
+				0x0418 0x1f 0x0
+				0x0420 0x1f 0x0
+				0x03f4 0x1f 0x0
+				0x03fc 0x1f 0x0
+				0x0404 0x1f 0x0
+				0x0bf8 0x1f 0x0
+				0x0c00 0x1f 0x0
+				0x0c08 0x1f 0x0
+				0x0c10 0x1f 0x0
+				0x0c18 0x1f 0x0
+				0x0c20 0x1f 0x0
+				0x0bf4 0x1f 0x0
+				0x0bfc 0x1f 0x0
+				0x0c04 0x1f 0x0
+				0x0208 0x0c 0x0
+				0x0a08 0x0c 0x0
+				0x020c 0x0a 0x0
+				0x0a0c 0x0a 0x0
+				0x02dc 0x0a 0x0
+				0x0adc 0x0a 0x0
+				0x0308 0x0b 0x0
+				0x0b08 0x0b 0x0
+				0x027c 0x10 0x0
+				0x0a7c 0x10 0x0
+				0x02b4 0x00 0x0
+				0x0ab4 0x00 0x0
+				0x02ec 0x0f 0x0
+				0x0aec 0x0f 0x0
+				0x02c4 0x00 0x0
+				0x02c8 0x1f 0x0
+				0x0ac4 0x00 0x0
+				0x0ac8 0x1f 0x0
+				0x0030 0x1a 0x0
+				0x0034 0x0c 0x0
+				0x0830 0x1a 0x0
+				0x0834 0x0c 0x0
+				0x141c 0xc1 0x0
+				0x1490 0x00 0x0
+				0x13e0 0x16 0x0
+				0x13e4 0x22 0x0
+				0x1508 0x02 0x0
+				0x14a0 0x16 0x0
+				0x1420 0x40 0x0
+				0x1584 0x28 0x0
+				0x1370 0x2e 0x0
+				0x155c 0x2e 0x0
+				0x140c 0x1d 0x0
+				0x1388 0xaa 0x0
+				0x1200 0x00 0x0
+				0x1244 0x03 0x0>;
 
 	iommu-map = <0x0 &apps_smmu 0x0200 0x1>,
 		<0x100 &apps_smmu 0x0201 0x1>,
@@ -143,11 +306,22 @@
 				pinctrl-0 = <&aqr_intn_wol_sig>;
 
 				compatible = "qcom,ioss-v2-device";
+				qcom,phy-rst-gpio = <0>;
 				qcom,ioss = <&ioss>;
-				qcom,ioss_interfaces = <&ioss_qps615_eth0>;
+				qcom,ioss_instance = <0>;
+				qcom,ioss_channels =
+					<&ioss_aqr_rx>,
+					<&ioss_aqr_tx>;
+
+				qcom,ioss-wol-phy;
+
+				interrupts-extended = <&tlmm 103 IRQ_TYPE_EDGE_FALLING>;
+				interrupt-names = "wol_irq";
 
 				/* ipa shares this group */
 				qcom,iommu-group = <&ipa_eth_group1>;
+				phy-supply = <&aqr_vreg>;
+				qcom,phy-rst-delay-us = <221000>;
 
 				#address-cells = <1>;
 				#size-cells = <1>;
@@ -168,11 +342,23 @@
 				pinctrl-0 = <&napa_intn_wol_sig>;
 
 				compatible = "qcom,ioss-v2-device";
+				qcom,phy-rst-gpio = <1>;
 				qcom,ioss = <&ioss>;
-				qcom,ioss_interfaces = <&ioss_qps615_eth1>;
+				qcom,ioss_instance = <1>;
+				qcom,ioss_channels =
+					<&ioss_napa_rx>,
+					<&ioss_napa_tx>;
+
+				qcom,ioss-wol-phy;
+				qcom,ioss-wol-magic;
+
+				interrupts-extended = <&tlmm 81 IRQ_TYPE_EDGE_FALLING>;
+				interrupt-names = "wol_irq";
 
 				/* ipa shares this group */
-				qcom,iommu-group = <&ipa_eth_group1>;
+				qcom,iommu-group = <&ipa_eth_group2>;
+				phy-supply = <&qca_vreg>;
+				qcom,phy-rst-delay-us = <20000>;
 
 				#address-cells = <1>;
 				#size-cells = <1>;
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-mbb-m2-ep.dts b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-mbb-m2-ep.dts
index 07688f87358c..48447ec9e98d 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-mbb-m2-ep.dts
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-mbb-m2-ep.dts
@@ -11,3 +11,7 @@
 		"qcom,sdxlemur", "qcom,mtp";
 	qcom,board-id = <0x8010008 0x308>;
 };
+
+&sdx_ext_ipc {
+	status = "ok";
+};
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-mbb-ntn3-pcie.dtsi b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-mbb-ntn3-pcie.dtsi
index 4335ee88f0f6..8700d095ec32 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-mbb-ntn3-pcie.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-mbb-ntn3-pcie.dtsi
@@ -1,9 +1,9 @@
 #include "sdxlemur-mtp-mbb.dtsi"
 
 &soc {
-	ntn3_vreg: ntn3_vreg {
+	qps615_vreg: qps615_vreg {
 		compatible = "regulator-fixed";
-		regulator-name = "ntn3_vreg";
+		regulator-name = "qps615_vreg";
 		gpio = <&tlmm 107 GPIO_ACTIVE_HIGH>;
 		regulator-min-microvolt = <1000000>;
 		regulator-max-microvolt = <1000000>;
@@ -15,13 +15,36 @@
 		compatible = "regulator-fixed";
 		regulator-name = "aqr_vreg";
 		gpio = <&tlmm 105 GPIO_ACTIVE_HIGH>;
-		vin-supply = <&ntn3_vreg>;
+		vin-supply = <&qps615_vreg>;
 		regulator-min-microvolt = <1000000>;
 		regulator-max-microvolt = <1000000>;
 		enable-active-high;
-		regulator-enable-ramp-delay = <2400>;
+		regulator-enable-ramp-delay = <10000>;
 	};
 
+	ioss_qps615_rx: qps615_rx@eth {
+		qcom,dir-rx;
+		qcom,rx-filter-ip;
+
+		qcom,ring-size = <128>;
+		qcom,buff-size = <2048>;
+
+		qcom,mod-count-min = <64>;
+		qcom,mod-count-max = <64>;
+		qcom,mod-usecs-min = <30>;
+		qcom,mod-usecs-max = <60>;
+	};
+
+	ioss_qps615_tx: qps615_tx@eth {
+		qcom,dir-tx;
+		qcom,ring-size = <512>;
+		qcom,buff-size = <2048>;
+
+		qcom,mod-count-min = <64>;
+		qcom,mod-count-max = <64>;
+		qcom,mod-usecs-min = <30>;
+		qcom,mod-usecs-max = <60>;
+	};
 };
 
 &i2c_3 {
@@ -40,7 +63,7 @@
 
 	qcom,filtered-bdfs = <0x02080000>;
 
-	vreg-3p3-supply = <&aqr_vreg>;
+	vreg-3p3-supply = <&qps615_vreg>;
 
 	iommu-map = <0x0 &apps_smmu 0x0200 0x1>,
 		<0x100 &apps_smmu 0x0201 0x1>,
@@ -72,6 +95,30 @@
 		/* BDF 2.3.0 */
 		pcie0_bus2_dev3_fn0: pcie0_bus2_dev3_fn0 {
 			reg = <0x1800 0x0 0x0 0x0 0x0>;
+			qps615_eth0,qps615_eth0@pcie0_rp {
+				reg = <0x0 0x0 0x0 0x0 0x0>;
+
+				compatible = "qcom,ioss-v2-device";
+				qcom,ioss = <&ioss>;
+				qcom,ioss_instance = <0>;
+				qcom,ioss_channels =
+					<&ioss_qps615_rx>,
+					<&ioss_qps615_tx>;
+
+				/* ipa shares this group */
+				qcom,iommu-group = <&ipa_eth_group1>;
+				phy-supply = <&aqr_vreg>;
+				qcom,phy-rst-delay-us = <221000>;
+
+				interrupts-extended = <&tlmm 103 IRQ_TYPE_EDGE_FALLING>;
+				interrupt-names = "wol_irq";
+
+				pinctrl-names = "default";
+				pinctrl-0 = <&aqr_intn_wol_sig>;
+
+				#address-cells = <1>;
+				#size-cells = <1>;
+			};
 			/* BDF 5.0.0 */
 			pcie0_bus5_dev0_fn0: pcie0_ntn3_eth0 {
 				reg = <0x0 0x0 0x0 0x0 0x0>;
@@ -83,28 +130,3 @@
 		};
 	};
 };
-
-&wlan {
-	mhi_events {
-		mhi_event@0 {
-			mhi,num-elements = <32>;
-			mhi,intmod = <0>;
-			mhi,msi = <1>;
-			mhi,priority = <0>;
-			mhi,brstmode = <2>;
-			mhi,data-type = <1>;
-		};
-
-		mhi_event@1 {
-			mhi,num-elements = <256>;
-			mhi,intmod = <0>;
-			mhi,msi = <2>;
-			mhi,priority = <1>;
-			mhi,brstmode = <2>;
-		};
-
-		mhi_event@2 {
-			status = "disabled";
-		};
-	};
-};
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-mbb-pcie-ep-ipq.dtsi b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-mbb-pcie-ep-ipq.dtsi
index e5e92cbeabee..a8a6ecc24d35 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-mbb-pcie-ep-ipq.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-mbb-pcie-ep-ipq.dtsi
@@ -14,10 +14,12 @@
 
 &pcie_ep {
 	status = "ok";
+	qcom,pcie-perst-enum;
 };
 
 &mhi_device {
 	status = "ok";
+	qcom,no-m0-timeout;
 };
 
 &mhi_net_device {
@@ -68,6 +70,4 @@
 	qcom,iommu-dma = "bypass";
 };
 
-&sdx_ext_ipc {
-	ipq807x_attach = <1>;
-};
+
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-mbb-pcie-ep.dtsi b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-mbb-pcie-ep.dtsi
index 969705c8f1dd..667259396edd 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-mbb-pcie-ep.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-mbb-pcie-ep.dtsi
@@ -66,4 +66,7 @@
 
 &usb {
 	qcom,iommu-dma = "bypass";
+	dwc3@a600000 {
+		snps,usb2-gadget-lpm-disable;
+	};
 };
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-mbb-pcie-rc-ep.dtsi b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-mbb-pcie-rc-ep.dtsi
index 088efbf1ad3c..6bd0120779cc 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-mbb-pcie-rc-ep.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-mtp-mbb-pcie-rc-ep.dtsi
@@ -25,15 +25,6 @@
 		qcom,mod-usecs-max = <128>;
 	};
 
-	ioss_aqc_eth0: aqc@eth0 {
-		qcom,name = "eth0";
-		qcom,ioss_instance = <0>;
-
-		qcom,ioss_channels =
-			<&ioss_aqc_eth0_rx>,
-			<&ioss_aqc_eth0_tx>;
-	};
-
 	ioss_r8125_eth0_rx: r8125_rx@eth0 {
 		qcom,dir-rx;
 		qcom,rx-filter-ip;
@@ -57,15 +48,6 @@
 		qcom,mod-usecs-min = <30>;
 		qcom,mod-usecs-max = <60>;
 	};
-
-	ioss_r8125_eth0: r8125@eth0 {
-		qcom,name = "eth0";
-		qcom,ioss_instance = <0>;
-
-		qcom,ioss_channels =
-			<&ioss_r8125_eth0_rx>,
-			<&ioss_r8125_eth0_tx>;
-	};
 };
 
 &pcie0_rp {
@@ -79,8 +61,10 @@
 		qcom,ioss = <&ioss>;
 		/* ipa shares this group with aqc */
 		qcom,iommu-group = <&ipa_eth_group1>;
-		qcom,ioss_interfaces =
-			<&ioss_aqc_eth0>;
+		qcom,ioss_instance = <0>;
+		qcom,ioss_channels =
+			<&ioss_aqc_eth0_rx>,
+			<&ioss_aqc_eth0_tx>;
 
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -117,7 +101,10 @@
 
 		compatible = "qcom,ioss-v2-device";
 		qcom,ioss = <&ioss>;
-		qcom,ioss_interfaces = <&ioss_r8125_eth0>;
+		qcom,ioss_instance = <0>;
+		qcom,ioss_channels =
+			<&ioss_r8125_eth0_rx>,
+			<&ioss_r8125_eth0_tx>;
 
 		/* ipa shares this group with rtl */
 		qcom,iommu-group = <&ipa_eth_group1>;
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-pcie.dtsi b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-pcie.dtsi
index cdfb037da0ba..05b1db8be5e1 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-pcie.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-pcie.dtsi
@@ -51,7 +51,7 @@
 		vreg-mx-supply = <&VDD_MXA_LEVEL>;
 
 		qcom,vreg-1p8-voltage-level = <1200000 1200000 30000>;
-		qcom,vreg-0p9-voltage-level = <912000 912000 132000>;
+		qcom,vreg-0p9-voltage-level = <912000 880000 132000>;
 		qcom,vreg-cx-voltage-level = <RPMH_REGULATOR_LEVEL_MAX
 						RPMH_REGULATOR_LEVEL_LOW_SVS 0>;
 		qcom,vreg-mx-voltage-level = <RPMH_REGULATOR_LEVEL_MAX
@@ -116,7 +116,7 @@
 		qcom,ep-latency = <10>;
 		qcom,num-parf-testbus-sel = <0xb9>;
 
-		qcom,pcie-phy-ver = <1102>;
+		qcom,pcie-phy-ver = <1108>;
 		qcom,phy-status-offset = <0x1214>;
 		qcom,phy-status-bit = <7>;
 		qcom,phy-power-down-offset = <0x1240>;
@@ -159,7 +159,7 @@
 				0x1168 0x0a 0x0
 				0x116c 0x04 0x0
 				0x119c 0x88 0x0
-				0x1174 0x20 0x0
+				0x1174 0x60 0x0
 				0x117c 0x06 0x0
 				0x11a0 0x14 0x0
 				0x11a8 0x0f 0x0
@@ -266,6 +266,8 @@
 				0x1584 0x28 0x0
 				0x1370 0x2e 0x0
 				0x155c 0x2e 0x0
+				0x140c 0x1d 0x0
+				0x1388 0xaa 0x0
 				0x1200 0x00 0x0
 				0x1244 0x03 0x0>;
 
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-qcn9000.dtsi b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-qcn9000.dtsi
index 868bf6bec76c..d3ec2dcd34c0 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-qcn9000.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-qcn9000.dtsi
@@ -24,6 +24,11 @@
 };
 
 &soc {
+	/* If QCN9000 is connected, LPM modes are disabled */
+	qcom,lpm-levels {
+		status = "disabled";
+	};
+
 	wifi0: qcom,cnss-qcn9000@a0000000 {
 		status = "disabled";
 		compatible = "qcom,cnss-qcn9000";
@@ -31,7 +36,7 @@
 		reg-names = "smmu_iova_ipa";
 		memory-region = <&qcn9000_0_mem>;
 		qcom,wlan-ramdump-dynamic = <0x400000>;
-		qrtr_node_id = <0x0>;
+		qrtr_node_id = <0x20>;
 		qca,auto-restart;
 		tgt-mem-mode = <0x1>;
 		board_id = <0xa4>;
@@ -155,7 +160,7 @@
 		reg-names = "smmu_iova_ipa";
 		memory-region = <&qcn9000_1_mem>;
 		qcom,wlan-ramdump-dynamic = <0x400000>;
-		qrtr_node_id = <0x0>;
+		qrtr_node_id = <0x21>;
 		qca,auto-restart;
 		tgt-mem-mode = <0x1>;
 		board_id = <0xa4>;
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-rcm-rc.dtsi b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-rcm-rc.dtsi
index a1c20370dd86..e6eb6b48d98e 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-rcm-rc.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-rcm-rc.dtsi
@@ -3,7 +3,6 @@
 #include <dt-bindings/iio/qti_power_supply_iio.h>
 #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
 #include <dt-bindings/spmi/spmi.h>
-#include "sdxlemur-cnss.dtsi"
 
 &pm7250b_clkdiv {
 	clocks = <&rpmhcc RPMH_CXO_CLK>;
@@ -15,6 +14,123 @@
 		qcom,batt-id-range-pct = <15>;
 		#include "qg-batterydata-alium-3600mah.dtsi"
 	};
+
+	ioss_aqc_eth0_rx: aqc_rx@eth0 {
+		qcom,dir-rx;
+		qcom,rx-filter-be;
+
+		qcom,ring-size = <1024>;
+		qcom,buff-size = <2048>;
+
+		qcom,mod-count-min = <15>;
+		qcom,mod-count-max = <25>;
+		qcom,mod-usecs-min = <64>;
+		qcom,mod-usecs-max = <128>;
+	};
+
+	ioss_aqc_eth0_tx: aqc_tx@eth0 {
+		qcom,dir-tx;
+		qcom,ring-size = <1024>;
+		qcom,buff-size = <2048>;
+
+		qcom,mod-count-min = <15>;
+		qcom,mod-count-max = <25>;
+		qcom,mod-usecs-min = <64>;
+		qcom,mod-usecs-max = <128>;
+	};
+
+	ioss_r8125_eth0_rx: r8125_rx@eth0 {
+		qcom,dir-rx;
+		qcom,rx-filter-ip;
+
+		qcom,ring-size = <1023>; /* Cannot be a power of 2 */
+		qcom,buff-size = <2048>;
+
+		qcom,mod-count-min = <32>;
+		qcom,mod-count-max = <64>;
+		qcom,mod-usecs-min = <30>;
+		qcom,mod-usecs-max = <60>;
+	};
+
+	ioss_r8125_eth0_tx: r8125_tx@eth0 {
+		qcom,dir-tx;
+		qcom,ring-size = <1024>;
+		qcom,buff-size = <2048>;
+
+		qcom,mod-count-min = <32>;
+		qcom,mod-count-max = <64>;
+		qcom,mod-usecs-min = <30>;
+		qcom,mod-usecs-max = <60>;
+	};
+};
+
+&pcie0_rp {
+	#address-cells = <5>;
+	#size-cells = <0>;
+
+	aquantia,aqc@pcie0_rp {
+		reg = <0 0 0 0 0>;
+
+		compatible = "qcom,ioss-v2-device";
+		qcom,ioss = <&ioss>;
+		/* ipa shares this group with aqc */
+		qcom,iommu-group = <&ipa_eth_group1>;
+		qcom,ioss_instance = <0>;
+		qcom,ioss_channels =
+			<&ioss_aqc_eth0_rx>,
+			<&ioss_aqc_eth0_tx>;
+
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		pci-ids =
+			"1d6a:0001",
+			"1d6a:d107",
+			"1d6a:07b1",
+			"1d6a:87b1",
+			"1d6a:d108",
+			"1d6a:08b1",
+			"1d6a:88b1",
+			"1d6a:d109",
+			"1d6a:09b1",
+			"1d6a:89b1",
+			"1d6a:d100",
+			"1d6a:00b1",
+			"1d6a:80b1",
+			"1d6a:11b1",
+			"1d6a:91b1",
+			"1d6a:12b1",
+			"1d6a:92b1",
+			"1d6a:00c0",
+			"1d6a:04c0",
+			"1d6a:12c0",
+			"1d6a:14c0",
+			"1d6a:93c0",
+			"1d6a:94c0";
+
+	};
+
+	realtek,rtl8125@pcie0_rp {
+		reg = <0 0 0 0 0>;
+
+		compatible = "qcom,ioss-v2-device";
+		qcom,ioss = <&ioss>;
+		qcom,ioss_instance = <0>;
+		qcom,ioss_channels =
+			<&ioss_r8125_eth0_rx>,
+			<&ioss_r8125_eth0_tx>;
+
+		/* ipa shares this group with rtl */
+		qcom,iommu-group = <&ipa_eth_group1>;
+
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		pci-ids =
+			"10ec:8125",
+			"10ec:3000";
+
+	};
 };
 
 &spmi_debug_bus {
@@ -28,9 +144,9 @@
 };
 
 &pcie0 {
-	qcom,boot-option = <0x1>;
 	qcom,l1-2-th-scale = <2>; /* 1us */
 	qcom,l1-2-th-value = <70>;
+	qcom,target-link-speed = <3>;
 };
 
 &qnand_1 {
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-regulators.dtsi b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-regulators.dtsi
index e4ce28c0af99..d765a90d2f71 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-regulators.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-regulators.dtsi
@@ -217,9 +217,9 @@
 		L4B: pmx65_l4: regulator-pmx65-l4 {
 			regulator-name = "pmx65_l4";
 			qcom,set = <RPMH_REGULATOR_SET_ALL>;
-			regulator-min-microvolt = <912000>;
+			regulator-min-microvolt = <880000>;
 			regulator-max-microvolt = <912000>;
-			qcom,init-voltage = <912000>;
+			qcom,init-voltage = <880000>;
 			qcom,init-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 	};
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-thermal-modem.dtsi b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-thermal-modem.dtsi
index 1a06dee942bd..e54074abffd8 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-thermal-modem.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-thermal-modem.dtsi
@@ -42,33 +42,33 @@
 				#cooling-cells = <2>;
 			};
 
-			pa_sdr0_dsc: pa_sdr0_dsc {
-				qcom,qmi-dev-name = "pa_sdr0_dsc";
+			pa_lte_sdr0_dsc: pa_lte_sdr0_dsc {
+				qcom,qmi-dev-name = "pa_lte_sdr0_dsc";
 				#cooling-cells = <2>;
 			};
 
-			pa_sdr1_dsc: pa_sdr1_dsc {
-				qcom,qmi-dev-name = "pa_sdr1_dsc";
+			pa_lte_sdr1_dsc: pa_lte_sdr1_dsc {
+				qcom,qmi-dev-name = "pa_lte_sdr1_dsc";
 				#cooling-cells = <2>;
 			};
 
-			pa_fr1_sdr0_dsc: pa_fr1_sdr0_dsc {
-				qcom,qmi-dev-name = "pa_fr1_sdr0_dsc";
+			pa_nr_sdr0_dsc: pa_nr_sdr0_dsc {
+				qcom,qmi-dev-name = "pa_nr_sdr0_dsc";
 				#cooling-cells = <2>;
 			};
 
-			pa_fr1_sdr1_dsc: pa_fr1_sdr1_dsc {
-				qcom,qmi-dev-name = "pa_fr1_sdr1_dsc";
+			pa_nr_sdr1_dsc: pa_nr_sdr1_dsc {
+				qcom,qmi-dev-name = "pa_nr_sdr1_dsc";
 				#cooling-cells = <2>;
 			};
 
-			pa_fr1_sdr0_scg_dsc: pa_fr1_sdr0_scg_dsc {
-				qcom,qmi-dev-name = "pa_fr1_sdr0_scg_dsc";
+			pa_nr_sdr0_scg_dsc: pa_nr_sdr0_scg_dsc {
+				qcom,qmi-dev-name = "pa_nr_sdr0_scg_dsc";
 				#cooling-cells = <2>;
 			};
 
-			pa_fr1_sdr1_scg_dsc: pa_fr1_sdr1_scg_dsc {
-				qcom,qmi-dev-name = "pa_fr1_sdr1_scg_dsc";
+			pa_nr_sdr1_scg_dsc: pa_nr_sdr1_scg_dsc {
+				qcom,qmi-dev-name = "pa_nr_sdr1_scg_dsc";
 				#cooling-cells = <2>;
 			};
 
@@ -92,11 +92,6 @@
 				#cooling-cells = <2>;
 			};
 
-			mmw_ul_throttling_dsc: mmw_ul_throttling_dsc {
-				qcom,qmi-dev-name = "mmw_ul_throttling_dsc";
-				#cooling-cells = <2>;
-			};
-
 			mmw_ific_dsc: mmw_ific_dsc {
 				qcom,qmi-dev-name = "mmw_ific_dsc";
 				#cooling-cells = <2>;
@@ -107,11 +102,6 @@
 				#cooling-cells = <2>;
 			};
 
-			wlan_bw: wlan_bw {
-				qcom,qmi-dev-name = "wlan_bw";
-				#cooling-cells = <2>;
-			};
-
 			modem_vdd: modem_vdd {
 				qcom,qmi-dev-name = "cpuv_restriction_cold";
 				#cooling-cells = <2>;
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-thermal.dtsi b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-thermal.dtsi
index eee39c1d8838..5ca372177e6d 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-thermal.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-thermal.dtsi
@@ -23,18 +23,59 @@
 		thermal-governor = "step_wise";
 		thermal-sensors = <&tsens0 1>;
 		trips {
-			cpu_config: active-config0 {
+			cpu_config0: active-config0 {
 				temperature = <95000>;
-				hysteresis = <0>;
+				hysteresis = <2000>;
+				type = "passive";
+			};
+
+			cpu_config1: active-config1 {
+				temperature = <97000>;
+				hysteresis = <3000>;
+				type = "passive";
+			};
+
+			cpu_config2: active-config2 {
+				temperature = <99000>;
+				hysteresis = <3000>;
 				type = "passive";
 			};
 		};
 
 		cooling-maps {
-			cpu_cdev {
-				trip = <&cpu_config>;
-				cooling-device = <&CPU0 THERMAL_NO_LIMIT
-							THERMAL_NO_LIMIT>;
+			cpu_cdev0 {
+				trip = <&cpu_config0>;
+				cooling-device = <&CPU0 1 1>;
+			};
+
+			cpu_cdev1 {
+				trip = <&cpu_config1>;
+				cooling-device = <&CPU0 2 2>;
+			};
+
+			cpu_cdev2 {
+				trip = <&cpu_config2>;
+				cooling-device = <&CPU0 3 THERMAL_NO_LIMIT>;
+			};
+		};
+	};
+
+	mdmss-0-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens0 3>;
+		trips {
+			mdmss0_config0: mdmss0-config0 {
+				temperature = <111000>;
+				hysteresis = <3000>;
+				type = "passive";
+			};
+
+			mdmss0_config1: mdmss0-config1 {
+				temperature = <115000>;
+				hysteresis = <2000>;
+				type = "passive";
 			};
 		};
 	};
@@ -43,23 +84,17 @@
 		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-governor = "step_wise";
-		thermal-sensors = <&tsens0 3>;
+		thermal-sensors = <&tsens0 4>;
 		trips {
 			mdmss1_config0: mdmss1-config0 {
-				temperature = <95000>;
-				hysteresis = <5000>;
+				temperature = <111000>;
+				hysteresis = <3000>;
 				type = "passive";
 			};
 
 			mdmss1_config1: mdmss1-config1 {
-				temperature = <100000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-
-			mdmss1_config2: mdmss1-config2 {
-				temperature = <105000>;
-				hysteresis = <5000>;
+				temperature = <115000>;
+				hysteresis = <2000>;
 				type = "passive";
 			};
 		};
@@ -67,41 +102,26 @@
 		cooling-maps {
 			lte_cdev0 {
 				trip = <&mdmss1_config0>;
-				cooling-device = <&modem_lte_dsc 7 7>;
+				cooling-device = <&modem_lte_dsc 8 8>;
 			};
 
 			nr_scg_cdev0 {
 				trip = <&mdmss1_config0>;
-				cooling-device = <&modem_nr_scg_dsc 2 2>;
+				cooling-device = <&modem_nr_scg_dsc 10 10>;
 			};
 
 			nr_cdev0 {
 				trip = <&mdmss1_config0>;
-				cooling-device = <&modem_nr_dsc 4 4>;
+				cooling-device = <&modem_nr_dsc 6 6>;
 			};
 
 			lte_cdev1 {
 				trip = <&mdmss1_config1>;
-				cooling-device = <&modem_lte_dsc 8 8>;
-			};
-
-			nr_scg_cdev1 {
-				trip = <&mdmss1_config1>;
-				cooling-device = <&modem_nr_scg_dsc 10 10>;
+				cooling-device = <&modem_lte_dsc 255 255>;
 			};
 
 			nr_cdev1 {
 				trip = <&mdmss1_config1>;
-				cooling-device = <&modem_nr_dsc 6 6>;
-			};
-
-			lte_cdev2 {
-				trip = <&mdmss1_config2>;
-				cooling-device = <&modem_lte_dsc 255 255>;
-			};
-
-			nr_cdev2 {
-				trip = <&mdmss1_config2>;
 				cooling-device = <&modem_nr_dsc 255 255>;
 			};
 		};
@@ -111,67 +131,19 @@
 		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-governor = "step_wise";
-		thermal-sensors = <&tsens0 4>;
+		thermal-sensors = <&tsens0 5>;
 		trips {
 			mdmss2_config0: mdmss2-config0 {
-				temperature = <95000>;
-				hysteresis = <5000>;
+				temperature = <111000>;
+				hysteresis = <3000>;
 				type = "passive";
 			};
 
 			mdmss2_config1: mdmss2-config1 {
-				temperature = <100000>;
-				hysteresis = <5000>;
+				temperature = <115000>;
+				hysteresis = <2000>;
 				type = "passive";
 			};
-
-			mdmss2_config2: mdmss2-config2 {
-				temperature = <105000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-		};
-
-		cooling-maps {
-			lte_cdev0 {
-				trip = <&mdmss2_config0>;
-				cooling-device = <&modem_lte_dsc 7 7>;
-			};
-
-			nr_scg_cdev0 {
-				trip = <&mdmss2_config0>;
-				cooling-device = <&modem_nr_scg_dsc 2 2>;
-			};
-
-			nr_cdev0 {
-				trip = <&mdmss2_config0>;
-				cooling-device = <&modem_nr_dsc 4 4>;
-			};
-
-			lte_cdev1 {
-				trip = <&mdmss2_config1>;
-				cooling-device = <&modem_lte_dsc 8 8>;
-			};
-
-			nr_scg_cdev1 {
-				trip = <&mdmss2_config1>;
-				cooling-device = <&modem_nr_scg_dsc 10 10>;
-			};
-
-			nr_cdev1 {
-				trip = <&mdmss2_config1>;
-				cooling-device = <&modem_nr_dsc 6 6>;
-			};
-
-			lte_cdev2 {
-				trip = <&mdmss2_config2>;
-				cooling-device = <&modem_lte_dsc 255 255>;
-			};
-
-			nr_cdev2 {
-				trip = <&mdmss2_config2>;
-				cooling-device = <&modem_nr_dsc 255 255>;
-			};
 		};
 	};
 
@@ -179,23 +151,17 @@
 		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-governor = "step_wise";
-		thermal-sensors = <&tsens0 5>;
+		thermal-sensors = <&tsens0 6>;
 		trips {
 			mdmss3_config0: mdmss3-config0 {
-				temperature = <95000>;
-				hysteresis = <5000>;
+				temperature = <111000>;
+				hysteresis = <3000>;
 				type = "passive";
 			};
 
 			mdmss3_config1: mdmss3-config1 {
-				temperature = <100000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-
-			mdmss3_config2: mdmss3-config2 {
-				temperature = <105000>;
-				hysteresis = <5000>;
+				temperature = <115000>;
+				hysteresis = <2000>;
 				type = "passive";
 			};
 		};
@@ -203,41 +169,26 @@
 		cooling-maps {
 			lte_cdev0 {
 				trip = <&mdmss3_config0>;
-				cooling-device = <&modem_lte_dsc 7 7>;
+				cooling-device = <&modem_lte_dsc 8 8>;
 			};
 
 			nr_scg_cdev0 {
 				trip = <&mdmss3_config0>;
-				cooling-device = <&modem_nr_scg_dsc 2 2>;
+				cooling-device = <&modem_nr_scg_dsc 10 10>;
 			};
 
 			nr_cdev0 {
 				trip = <&mdmss3_config0>;
-				cooling-device = <&modem_nr_dsc 4 4>;
+				cooling-device = <&modem_nr_dsc 6 6>;
 			};
 
 			lte_cdev1 {
 				trip = <&mdmss3_config1>;
-				cooling-device = <&modem_lte_dsc 8 8>;
-			};
-
-			nr_scg_cdev1 {
-				trip = <&mdmss3_config1>;
-				cooling-device = <&modem_nr_scg_dsc 10 10>;
+				cooling-device = <&modem_lte_dsc 255 255>;
 			};
 
 			nr_cdev1 {
 				trip = <&mdmss3_config1>;
-				cooling-device = <&modem_nr_dsc 6 6>;
-			};
-
-			lte_cdev2 {
-				trip = <&mdmss3_config2>;
-				cooling-device = <&modem_lte_dsc 255 255>;
-			};
-
-			nr_cdev2 {
-				trip = <&mdmss3_config2>;
 				cooling-device = <&modem_nr_dsc 255 255>;
 			};
 		};
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-usb.dtsi b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-usb.dtsi
index a80512eb8688..5d337b3be5fe 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-usb.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-usb.dtsi
@@ -8,11 +8,12 @@
 
 		iommus = <&apps_smmu 0x1a0 0x0>;
 		qcom,iommu-dma = "atomic";
-		qcom,iommu-dma-addr-pool = <0x40000000 0x5ffe0000>;
+		qcom,iommu-dma-addr-pool = <0x90000000 0x0ffe0000>;
 		#address-cells = <1>;
 		#size-cells = <1>;
 		ranges;
 		dma-ranges;
+		qcom,iommu-best-fit-algo;
 
 		interrupts-extended = <&pdc 19 IRQ_TYPE_EDGE_RISING>,
 				<&intc GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>,
@@ -72,7 +73,7 @@
 			tx-fifo-resize;
 			maximum-speed = "super-speed-plus";
 			dr_mode = "otg";
-			snps,xhci-imod-value = <4000>;
+			imod-interval-ns = <1000000>;
 		};
 
 		qcom,usbbam@a704000 {
@@ -116,7 +117,7 @@
 		reg-names = "hsusb_phy_base",
 			"eud_enable_reg";
 		vdd-supply = <&pmx65_l4>;
-		qcom,vdd-voltage-level = <0 912000 912000>;
+		qcom,vdd-voltage-level = <0 880000 912000>;
 		vdda18-supply = <&pmx65_l5>;
 		vdda33-supply = <&pmx65_l10>;
 
@@ -137,7 +138,7 @@
 			"pcs_clamp_enable_reg";
 
 		vdd-supply = <&pmx65_l4>;
-		qcom,vdd-voltage-level = <0 912000 912000>;
+		qcom,vdd-voltage-level = <0 880000 912000>;
 		qcom,vdd-max-load-uA = <47900>;
 		core-supply = <&pmx65_l1>;
 		qcom,core-max-load-uA = <15000>;
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-atp.dts b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-atp.dts
new file mode 100644
index 000000000000..4fceb2ef95c5
--- /dev/null
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-atp.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+
+#include "sdxlemur-v2.dtsi"
+#include "sdxlemur-atp.dtsi"
+#include "sdxlemur-512mb.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SDXLEMUR ATP V2";
+	compatible = "qcom,sdxlemur-atp",
+		"qcom,sdxlemur", "qcom,atp";
+	qcom,board-id = <0x010021 0x200>;
+};
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-cdp.dts b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-cdp.dts
index 769730839959..60d4fd8b30c7 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-cdp.dts
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-cdp.dts
@@ -11,5 +11,5 @@
 	model = "Qualcomm Technologies, Inc. SDXLEMUR CDP V2";
 	compatible = "qcom,sdxlemur-cdp",
 		"qcom,sdxlemur", "qcom,cdp";
-	qcom,board-id = <0x20001 0x300>;
+	qcom,board-id = <0x01 0x300>;
 };
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-m2-ep-fwa.dts b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-m2-ep-fwa.dts
new file mode 100644
index 000000000000..54b4378980c0
--- /dev/null
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-m2-ep-fwa.dts
@@ -0,0 +1,21 @@
+/dts-v1/;
+
+#include "sdxlemur-v2.dtsi"
+#include "sdxlemur-mtp-mbb-pcie-ep-ipq.dtsi"
+#include "sdxlemur-mtp-mbb-m2-ep.dtsi"
+#include "sdxlemur-1024mb.dtsi"
+#include "sdxlemur-v2-m2-ep-fwa.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SDXLEMUR M2 EP FWA V2";
+	compatible = "qcom,sdxlemur-mtp",
+		"qcom,sdxlemur", "qcom,mtp";
+	qcom,board-id = <0x11010008 0x311>;
+};
+
+&sdx_ext_ipc {
+	qcom,status-in-gpio = <&tlmm 12 0x00>;
+	qcom,status-out-gpio = <&tlmm 13 0x00>;
+	qcom,status-out2-gpio = <&tlmm 15 0x00>;
+	status = "ok";
+};
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-m2-ep-fwa.dtsi b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-m2-ep-fwa.dtsi
new file mode 100644
index 000000000000..336d7a250678
--- /dev/null
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-m2-ep-fwa.dtsi
@@ -0,0 +1,2 @@
+/ {
+};
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-cpe-pine1x.dts b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-cpe-pine1x.dts
new file mode 100644
index 000000000000..8b0d1e19d836
--- /dev/null
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-cpe-pine1x.dts
@@ -0,0 +1,14 @@
+/dts-v1/;
+
+#include "sdxlemur-v2.dtsi"
+#include "sdxlemur-mtp-cpe.dtsi"
+#include "sdxlemur-mtp-cpe-pine1x.dtsi"
+#include "sdxlemur-1024mb.dtsi"
+#include "sdxlemur-bluetooth.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SDXLEMUR MTP CPE 1x Pine V2";
+	compatible = "qcom,sdxlemur-mtp",
+		"qcom,sdxlemur", "qcom,mtp";
+	qcom,board-id = <0x9010008 0x309>;
+};
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-cpe-pine2x.dts b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-cpe-pine2x.dts
new file mode 100644
index 000000000000..77b04077a9ff
--- /dev/null
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-cpe-pine2x.dts
@@ -0,0 +1,14 @@
+/dts-v1/;
+
+#include "sdxlemur-v2.dtsi"
+#include "sdxlemur-mtp-cpe.dtsi"
+#include "sdxlemur-mtp-cpe-pine2x.dtsi"
+#include "sdxlemur-1024mb.dtsi"
+#include "sdxlemur-bluetooth.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SDXLEMUR MTP CPE 2x Pine V2";
+	compatible = "qcom,sdxlemur-mtp",
+		"qcom,sdxlemur", "qcom,mtp";
+	qcom,board-id = <0xA010008 0x30A>;
+};
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-cpe.dts b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-cpe.dts
index f8670b646394..43610fa9f3d6 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-cpe.dts
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-cpe.dts
@@ -2,13 +2,15 @@
 
 #include "sdxlemur-v2.dtsi"
 #include "sdxlemur-mtp-cpe.dtsi"
+#include "sdxlemur-mtp-cpe-hsp.dtsi"
 #include "sdxlemur-1024mb-cpe.dtsi"
 #include "sdxlemur-audio.dtsi"
 #include "sdxlemur-mtp-audio-overlay.dtsi"
+#include "sdxlemur-bluetooth.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SDXLEMUR MTP CPE V2";
 	compatible = "qcom,sdxlemur-mtp",
 		"qcom,sdxlemur", "qcom,mtp";
-	qcom,board-id = <0x6020008 0x306>;
+	qcom,board-id = <0x6010008 0x306>;
 };
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-emmc-512mb.dts b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-emmc-512mb.dts
new file mode 100644
index 000000000000..220761d0bb94
--- /dev/null
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-emmc-512mb.dts
@@ -0,0 +1,14 @@
+/dts-v1/;
+
+#include "sdxlemur-v2.dtsi"
+#include "sdxlemur-mtp-mbb-pcie-ep.dtsi"
+#include "sdxlemur-mtp-mbb-emmc.dtsi"
+#include "sdxlemur-512mb.dtsi"
+#include "sdxlemur-bluetooth.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SDXLEMUR MTP MBB eMMC 512 MB V2";
+	compatible = "qcom,sdxlemur-mtp",
+		"qcom,sdxlemur", "qcom,mtp";
+	qcom,board-id = <0x2010108 0x202>;
+};
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-emmc.dts b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-emmc.dts
index 633ca94dcd73..447854dcbb5d 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-emmc.dts
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-emmc.dts
@@ -11,5 +11,5 @@
 	model = "Qualcomm Technologies, Inc. SDXLEMUR MTP MBB eMMC V2";
 	compatible = "qcom,sdxlemur-mtp",
 		"qcom,sdxlemur", "qcom,mtp";
-	qcom,board-id = <0x2020108 0x302>;
+	qcom,board-id = <0x2010108 0x302>;
 };
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-m2-ep-usb.dts b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-m2-ep-usb.dts
new file mode 100644
index 000000000000..6180453ec7eb
--- /dev/null
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-m2-ep-usb.dts
@@ -0,0 +1,13 @@
+/dts-v1/;
+
+#include "sdxlemur-v2.dtsi"
+#include "sdxlemur-mtp-mbb-pcie-ep.dtsi"
+#include "sdxlemur-mtp-mbb-m2-ep-usb.dtsi"
+#include "sdxlemur-1024mb.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SDXLEMUR MTP MBB M2 EP USB V2";
+	compatible = "qcom,sdxlemur-mtp",
+		"qcom,sdxlemur", "qcom,mtp";
+	qcom,board-id = <0x10010008 0x310>;
+};
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-m2-ep.dts b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-m2-ep.dts
new file mode 100644
index 000000000000..37b1cc8284cd
--- /dev/null
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-m2-ep.dts
@@ -0,0 +1,17 @@
+/dts-v1/;
+
+#include "sdxlemur-v2.dtsi"
+#include "sdxlemur-mtp-mbb-pcie-ep.dtsi"
+#include "sdxlemur-mtp-mbb-m2-ep.dtsi"
+#include "sdxlemur-1024mb.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SDXLEMUR MTP MBB M2 EP V2";
+	compatible = "qcom,sdxlemur-mtp",
+		"qcom,sdxlemur", "qcom,mtp";
+	qcom,board-id = <0x8010008 0x308>;
+};
+
+&sdx_ext_ipc {
+	status = "ok";
+};
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-ntn3-pcie.dts b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-ntn3-pcie.dts
index 65630ea06a58..463b234bbb4a 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-ntn3-pcie.dts
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-ntn3-pcie.dts
@@ -10,5 +10,5 @@
 	model = "Qualcomm Technologies, Inc. SDXLEMUR MTP MBB NTN3 PCIE V2";
 	compatible = "qcom,sdxlemur-mtp",
 		"qcom,sdxlemur", "qcom,mtp";
-	qcom,board-id = <0x5020008 0x305>;
+	qcom,board-id = <0x5010008 0x305>;
 };
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-pcie-ep-ipq.dts b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-pcie-ep-ipq.dts
index e638af1217be..58375d3d5253 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-pcie-ep-ipq.dts
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-pcie-ep-ipq.dts
@@ -8,5 +8,10 @@
 	model = "Qualcomm Technologies, Inc. SDXLEMUR MTP MBB PCIE-EP V2";
 	compatible = "qcom,sdxlemur-mtp",
 		"qcom,sdxlemur", "qcom,mtp";
-	qcom,board-id = <0xB020008 0x20B>;
+	qcom,board-id = <0xB010008 0x20B>;
+};
+
+&sdx_ext_ipc {
+	ipq807x_attach = <1>;
+	status = "ok";
 };
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-pcie-ep.dts b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-pcie-ep.dts
index 77326071dd86..7c113e5da418 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-pcie-ep.dts
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-pcie-ep.dts
@@ -8,5 +8,5 @@
 	model = "Qualcomm Technologies, Inc. SDXLEMUR MTP MBB PCIE-EP V2";
 	compatible = "qcom,sdxlemur-mtp",
 		"qcom,sdxlemur", "qcom,mtp";
-	qcom,board-id = <0x4020008 0x204>;
+	qcom,board-id = <0x4010008 0x204>;
 };
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-pcie-rc-ep.dts b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-pcie-rc-ep.dts
index c5956de09f13..f0d1d2a65218 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-pcie-rc-ep.dts
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb-pcie-rc-ep.dts
@@ -8,5 +8,5 @@
 	model = "Qualcomm Technologies, Inc. SDXLEMUR MTP MBB RC PCIE-EP V2";
 	compatible = "qcom,sdxlemur-mtp",
 		"qcom,sdxlemur", "qcom,mtp";
-	qcom,board-id = <0x3020008 0x203>;
+	qcom,board-id = <0x3010008 0x203>;
 };
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb.dts b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb.dts
index 0dc789e85177..275d5b25f80a 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb.dts
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp-mbb.dts
@@ -6,10 +6,11 @@
 #include "sdxlemur-audio.dtsi"
 #include "sdxlemur-mtp-audio-overlay.dtsi"
 #include "sdxlemur-bluetooth.dtsi"
+#include "display/sdxlemur-qpic-display.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SDXLEMUR MTP MBB V2";
 	compatible = "qcom,sdxlemur-mtp",
 		"qcom,sdxlemur", "qcom,mtp";
-	qcom,board-id = <0x2020008 0x302>;
+	qcom,board-id = <0x2010008 0x302>;
 };
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp.dts b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp.dts
index cac68602ccf4..467fc0fc7a10 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp.dts
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-mtp.dts
@@ -11,5 +11,5 @@
 	model = "Qualcomm Technologies, Inc. SDXLEMUR MTP V2";
 	compatible = "qcom,sdxlemur-mtp",
 		"qcom,sdxlemur", "qcom,mtp";
-	qcom,board-id = <0x20008 0x300>;
+	qcom,board-id = <0x08 0x300>;
 };
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-rcm-pcie-ep.dts b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-rcm-pcie-ep.dts
index b22c1df9690e..c2726331b1a9 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-rcm-pcie-ep.dts
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-rcm-pcie-ep.dts
@@ -8,5 +8,5 @@
 	model = "Qualcomm Technologies, Inc. SDXLEMUR RCM PCIe-EP V2";
 	compatible = "qcom,sdxlemur-rcm",
 		"qcom,sdxlemur", "qcom,rcm";
-	qcom,board-id = <0x1020015 0x201>;
+	qcom,board-id = <0x1010015 0x201>;
 };
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-rcm-rc-pine1x.dts b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-rcm-rc-pine1x.dts
new file mode 100644
index 000000000000..07de3ae04b90
--- /dev/null
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-rcm-rc-pine1x.dts
@@ -0,0 +1,13 @@
+/dts-v1/;
+
+#include "sdxlemur-v2.dtsi"
+#include "sdxlemur-rcm-rc.dtsi"
+#include "sdxlemur-rcm-rc-pine1x.dtsi"
+#include "sdxlemur-1024mb.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SDXLEMUR RCM Root Complex 1x Pine V2";
+	compatible = "qcom,sdxlemur-rcm",
+		"qcom,sdxlemur", "qcom,rcm";
+	qcom,board-id = <0x2010015 0x302>;
+};
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-rcm-rc-pine2x.dts b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-rcm-rc-pine2x.dts
new file mode 100644
index 000000000000..54a8cc00ac91
--- /dev/null
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-rcm-rc-pine2x.dts
@@ -0,0 +1,13 @@
+/dts-v1/;
+
+#include "sdxlemur-v2.dtsi"
+#include "sdxlemur-rcm-rc.dtsi"
+#include "sdxlemur-rcm-rc-pine2x.dtsi"
+#include "sdxlemur-1024mb.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SDXLEMUR RCM Root Complex 2x Pine V2";
+	compatible = "qcom,sdxlemur-rcm",
+		"qcom,sdxlemur", "qcom,rcm";
+	qcom,board-id = <0x3010015 0x303>;
+};
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-rcm-rc.dts b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-rcm-rc.dts
index 5f66a7bfd927..3fea6cbf8473 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-rcm-rc.dts
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2-rcm-rc.dts
@@ -11,5 +11,5 @@
 	model = "Qualcomm Technologies, Inc. SDXLEMUR RCM Root Complex V2";
 	compatible = "qcom,sdxlemur-rcm",
 		"qcom,sdxlemur", "qcom,rcm";
-	qcom,board-id = <0x20015 0x300>;
+	qcom,board-id = <0x10015 0x300>;
 };
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2.dtsi b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2.dtsi
index 3740fd2d468c..2d9f76145127 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur-v2.dtsi
@@ -3,159 +3,163 @@
 / {
 	model = "Qualcomm Technologies, Inc. SDXLEMUR V2";
 	compatible = "qcom,sdxlemur";
-	qcom,msm-id = <458 0x20000>, <483 0x20000>;
+	qcom,msm-id = <458 0x20000>, <483 0x20000>, <509 0x20000>;
+};
+
+/* Overriding the BAM node to enable SMMU S1 support in sdxlemur V2
+ * Adding i2c SID's in BAM node, as descriptors buffers for i2c
+ * usecase are allocated in BAM DMA driver.
+ */
+&dma_blsp1 {
+	iommus = <&apps_smmu 0x148 0x1>,
+		<&apps_smmu 0x14a 0x1>,
+		<&apps_smmu 0x14c 0x1>,
+		<&apps_smmu 0x14e 0x1>;
+	qcom,iommu-dma-addr-pool = <0x40000000 0x10000000>;
+	qcom,iommu-geometry = <0x40000000 0x10000000>;
+	qcom,iommu-dma = "fastmap";
 };
 
 &i2c_1 {
-	iommus = <&apps_smmu 0x148 0x0>,
-		<&apps_smmu 0x149 0x0>;
+	iommus = <&apps_smmu 0x148 0x1>;
 	qcom,iommu-dma-addr-pool = <0x40000000 0x10000000>;
 	qcom,iommu-geometry = <0x40000000 0x10000000>;
 	qcom,iommu-dma = "fastmap";
 };
 
 &i2c_2 {
-	iommus = <&apps_smmu 0x14a 0x0>,
-		<&apps_smmu 0x14b 0x0>;
+	iommus = <&apps_smmu 0x14a 0x1>;
 	qcom,iommu-dma-addr-pool = <0x40000000 0x10000000>;
 	qcom,iommu-geometry = <0x40000000 0x10000000>;
 	qcom,iommu-dma = "fastmap";
 };
 
 &i2c_3 {
-	iommus = <&apps_smmu 0x14c 0x0>,
-		<&apps_smmu 0x14d 0x0>;
+	iommus = <&apps_smmu 0x14c 0x1>;
 	qcom,iommu-dma-addr-pool = <0x40000000 0x10000000>;
 	qcom,iommu-geometry = <0x40000000 0x10000000>;
 	qcom,iommu-dma = "fastmap";
 };
 
 &i2c_4 {
-	iommus = <&apps_smmu 0x14e 0x0>,
-		<&apps_smmu 0x14f 0x0>;
+	iommus = <&apps_smmu 0x14e 0x1>;
 	qcom,iommu-dma-addr-pool = <0x40000000 0x10000000>;
 	qcom,iommu-geometry = <0x40000000 0x10000000>;
 	qcom,iommu-dma = "fastmap";
 };
 
 &i2c_5 {
-	iommus = <&apps_smmu 0x148 0x0>,
-		<&apps_smmu 0x149 0x0>;
+	iommus = <&apps_smmu 0x148 0x1>;
 	qcom,iommu-dma-addr-pool = <0x40000000 0x10000000>;
 	qcom,iommu-geometry = <0x40000000 0x10000000>;
 	qcom,iommu-dma = "fastmap";
 };
 
 &i2c_6 {
-	iommus = <&apps_smmu 0x14a 0x0>,
-		<&apps_smmu 0x14b 0x0>;
+	iommus = <&apps_smmu 0x14a 0x1>;
 	qcom,iommu-dma-addr-pool = <0x40000000 0x10000000>;
 	qcom,iommu-geometry = <0x40000000 0x10000000>;
 	qcom,iommu-dma = "fastmap";
 };
 
 &i2c_7 {
-	iommus = <&apps_smmu 0x14e 0x0>,
-		<&apps_smmu 0x14f 0x0>;
+	iommus = <&apps_smmu 0x14e 0x1>;
 	qcom,iommu-dma-addr-pool = <0x40000000 0x10000000>;
 	qcom,iommu-geometry = <0x40000000 0x10000000>;
 	qcom,iommu-dma = "fastmap";
 };
 
 &spi_1 {
-	iommus = <&apps_smmu 0x148 0x0>,
-		<&apps_smmu 0x149 0x0>;
+	iommus = <&apps_smmu 0x148 0x1>;
 	qcom,iommu-dma-addr-pool = <0x40000000 0x10000000>;
 	qcom,iommu-geometry = <0x40000000 0x10000000>;
 	qcom,iommu-dma = "fastmap";
 };
 
 &spi_2 {
-	iommus = <&apps_smmu 0x14a 0x0>,
-		<&apps_smmu 0x14b 0x0>;
+	iommus = <&apps_smmu 0x14a 0x1>;
 	qcom,iommu-dma-addr-pool = <0x40000000 0x10000000>;
 	qcom,iommu-geometry = <0x40000000 0x10000000>;
 	qcom,iommu-dma = "fastmap";
 };
 
 &spi_3 {
-	iommus = <&apps_smmu 0x14c 0x0>,
-		<&apps_smmu 0x14d 0x0>;
+	iommus = <&apps_smmu 0x14c 0x1>;
 	qcom,iommu-dma-addr-pool = <0x40000000 0x10000000>;
 	qcom,iommu-geometry = <0x40000000 0x10000000>;
 	qcom,iommu-dma = "fastmap";
 };
 
 &spi_4 {
-	iommus = <&apps_smmu 0x14e 0x0>,
-		<&apps_smmu 0x14f 0x0>;
+	iommus = <&apps_smmu 0x14e 0x1>;
 	qcom,iommu-dma-addr-pool = <0x40000000 0x10000000>;
 	qcom,iommu-geometry = <0x40000000 0x10000000>;
 	qcom,iommu-dma = "fastmap";
 };
 
 &blsp1_uart1a_hs {
-	iommus = <&apps_smmu 0x140 0x0>,
-		<&apps_smmu 0x141 0x0>;
+	iommus = <&apps_smmu 0x140 0x1>;
 	qcom,iommu-dma-addr-pool = <0x40000000 0x10000000>;
 	qcom,iommu-geometry = <0x40000000 0x10000000>;
 	qcom,iommu-dma = "fastmap";
 };
 
 &blsp1_uart1b_hs {
-	iommus = <&apps_smmu 0x140 0x0>,
-		<&apps_smmu 0x141 0x0>;
+	iommus = <&apps_smmu 0x140 0x1>;
 	qcom,iommu-dma-addr-pool = <0x40000000 0x10000000>;
 	qcom,iommu-geometry = <0x40000000 0x10000000>;
 	qcom,iommu-dma = "fastmap";
 };
 
 &blsp1_uart2a_hs {
-	iommus = <&apps_smmu 0x142 0x0>,
-		<&apps_smmu 0x143 0x0>;
+	iommus = <&apps_smmu 0x142 0x1>;
 	qcom,iommu-dma-addr-pool = <0x40000000 0x10000000>;
 	qcom,iommu-geometry = <0x40000000 0x10000000>;
 	qcom,iommu-dma = "fastmap";
 };
 
 &blsp1_uart2b_hs {
-	iommus = <&apps_smmu 0x142 0x0>,
-		<&apps_smmu 0x143 0x0>;
+	iommus = <&apps_smmu 0x142 0x1>;
 	qcom,iommu-dma-addr-pool = <0x40000000 0x10000000>;
 	qcom,iommu-geometry = <0x40000000 0x10000000>;
 	qcom,iommu-dma = "fastmap";
 };
 
 &blsp1_uart3_hs {
-	iommus = <&apps_smmu 0x144 0x0>,
-		<&apps_smmu 0x145 0x0>;
+	iommus = <&apps_smmu 0x144 0x1>;
 	qcom,iommu-dma-addr-pool = <0x40000000 0x10000000>;
 	qcom,iommu-geometry = <0x40000000 0x10000000>;
 	qcom,iommu-dma = "fastmap";
 };
 
 &blsp1_uart4a_hs {
-	iommus = <&apps_smmu 0x146 0x0>,
-		<&apps_smmu 0x147 0x0>;
+	iommus = <&apps_smmu 0x146 0x1>;
 	qcom,iommu-dma-addr-pool = <0x40000000 0x10000000>;
 	qcom,iommu-geometry = <0x40000000 0x10000000>;
 	qcom,iommu-dma = "fastmap";
 };
 
 &blsp1_uart4b_hs {
-	iommus = <&apps_smmu 0x146 0x0>,
-		<&apps_smmu 0x147 0x0>;
+	iommus = <&apps_smmu 0x146 0x1>;
 	qcom,iommu-dma-addr-pool = <0x40000000 0x10000000>;
 	qcom,iommu-geometry = <0x40000000 0x10000000>;
 	qcom,iommu-dma = "fastmap";
 };
 
+&apsscc {
+	qcom,speed0-bin-v0 =
+		<   345600000 RPMH_REGULATOR_LEVEL_LOW_SVS>,
+		<   576000000 RPMH_REGULATOR_LEVEL_SVS>,
+		<  1094400000 RPMH_REGULATOR_LEVEL_NOM>,
+		<  1804800000 RPMH_REGULATOR_LEVEL_TURBO>;
+};
+
 &cpufreq {
 	qcom,cpufreq-table =
 		<  345600 >,
 		<  576000 >,
 		<  1094400 >,
-		<  1708800 >;
+		<  1804800 >;
 };
 
 &cpu0_cpu_ddr_tbl {
@@ -163,5 +167,14 @@
 		<   345600  MHZ_TO_MBPS( 300, 4) >,
 		<   576000  MHZ_TO_MBPS( 768, 4) >,
 		<  1440000  MHZ_TO_MBPS(1555, 4) >,
-		<  1708800  MHZ_TO_MBPS(2092, 4) >;
+		<  1804800  MHZ_TO_MBPS(2092, 4) >;
+};
+
+&pil_modem {
+	qcom,vdd_mss-uV-uA = <RPMH_REGULATOR_LEVEL_NOM_L1 100000>;
+};
+
+
+&dload_mode {
+	qcom,boot-config-shift = <1 4>;
 };
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxlemur.dtsi b/arch/arm64/boot/dts/vendor/qcom/sdxlemur.dtsi
index c6f4217a2bba..3ffb3e2dd6f1 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxlemur.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxlemur.dtsi
@@ -196,8 +196,11 @@
 		};
 	};
 
-	dload_mode {
+	dload_mode: dload_mode {
 		compatible = "qcom,dload-mode";
+		reg = <0x786070 0x4>;
+		reg-names = "boot-config";
+		qcom,boot-config-shift = <1 3>;
 	};
 
 	dcc: dcc_v2@117f000 {
@@ -943,7 +946,7 @@
 		vreg-mx-supply = <&VDD_MXA_LEVEL>;
 
 		qcom,vreg-1p8-voltage-level = <1200000 1200000 30000>;
-		qcom,vreg-0p9-voltage-level = <912000 912000 132000>;
+		qcom,vreg-0p9-voltage-level = <912000 880000 132000>;
 		qcom,vreg-mx-voltage-level = <RPMH_REGULATOR_LEVEL_MAX RPMH_REGULATOR_LEVEL_NOM 0>;
 
 		clocks = <&gcc GCC_PCIE_PIPE_CLK>,
@@ -977,8 +980,8 @@
 
 			qcom,pcie-vendor-id = /bits/ 16 <0x17cb>;
 			qcom,pcie-device-id = /bits/ 16 <0x0308>;
-			qcom,pcie-link-speed = <4>;
-			qcom,pcie-phy-ver = <6>;
+			qcom,pcie-link-speed = <3>;
+			qcom,pcie-phy-ver = <7>;
 			qcom,pcie-active-config;
 			qcom,pcie-aggregated-irq;
 			qcom,pcie-mhi-a7-irq;
@@ -986,6 +989,7 @@
 			qcom,mhi-soc-reset-offset = <0xb01b8>;
 			qcom,aoss-rst-clr;
 			qcom,aux-clk = <0x11>;
+			qcom,avoid-reboot-in-d3hot;
 
 			qcom,phy-init = <0x1240 0x01 0x0
 				0x100c 0x02 0x0
@@ -1018,7 +1022,7 @@
 				0x1168 0x0a 0x0
 				0x116c 0x04 0x0
 				0x119c 0x88 0x0
-				0x1174 0x20 0x0
+				0x1174 0x60 0x0
 				0x11a0 0x14 0x0
 				0x11a8 0x0f 0x0
 				0x0220 0x16 0x0
@@ -1123,6 +1127,7 @@
 				0x1370 0x2e 0x0
 				0x155c 0x2e 0x0
 				0x1484 0x08 0x0
+				0x1388 0xaa 0x0
 				0x1200 0x00 0x0
 				0x1244 0x03 0x0>;
 
@@ -1139,7 +1144,7 @@
 			qcom,mhi-ep-msi = <0>;
 			qcom,mhi-version = <0x1000000>;
 			qcom,use-ipa-software-channel;
-			interrupts = <0 145 0>;
+			interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "mhi-device-inta";
 			qcom,mhi-ifc-id = <0x030817cb>;
 			qcom,mhi-interrupt;
@@ -1208,7 +1213,6 @@
 		qcom,register-collection-on-crash;
 		qcom,testbus-collection-on-crash;
 		qcom,non-tn-collection-on-crash;
-		qcom,lan-rx-napi;
 		clock-names = "core_clk";
 		clocks = <&rpmhcc RPMH_IPA_CLK>;
 		qcom,interconnect,num-cases = <5>;
@@ -1241,7 +1245,7 @@
 
 		qcom,bus-vector-names = "MIN", "SVS2", "SVS", "NOMINAL",
 		"TURBO";
-		qcom,throughput-threshold = <3000 5000 10000>;
+		qcom,throughput-threshold = <2000 2500 10000>;
 		qcom,scaling-exceptions = <>;
 
 		ipa_smmu_ap: ipa_smmu_ap {
@@ -1445,6 +1449,7 @@
 		qcom,status-in-gpio = <&tlmm 65 0x00>;
 		qcom,status-out-gpio = <&tlmm 44 0x00>;
 		qcom,status-out2-gpio = <&tlmm 45 0x00>;
+		status = "disabled";
 	};
 };
 
diff --git a/arch/arm64/boot/dts/vendor/qcom/sdxnightjar.dtsi b/arch/arm64/boot/dts/vendor/qcom/sdxnightjar.dtsi
index b15152a754e5..c75d57edf105 100644
--- a/arch/arm64/boot/dts/vendor/qcom/sdxnightjar.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/sdxnightjar.dtsi
@@ -49,7 +49,7 @@
 
 		mss_mem: mss_region@0x88000000 {
 			no-map;
-			reg = <0x88000000 0x6e00000>;
+			reg = <0x88000000 0x6600000>;
 			label = "mss_mem";
 		};
 
@@ -187,7 +187,7 @@
 		qcom,firmware-name = "modem";
 		qcom,pil-self-auth;
 		qcom,sysmon-id = <0>;
-		qcom,ssctl-instance-id = <0x12>;
+		qcom,ssctl-instance-id = <0x22>;
 		qcom,override-acc;
 		qcom,qdsp6v61-1-1;
 		memory-region = <&mss_mem>;
diff --git a/arch/arm64/boot/dts/vendor/qcom/shima-atp.dtsi b/arch/arm64/boot/dts/vendor/qcom/shima-atp.dtsi
index 3fc75973a822..f94b6882afa8 100644
--- a/arch/arm64/boot/dts/vendor/qcom/shima-atp.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/shima-atp.dtsi
@@ -199,8 +199,8 @@
 	};
 };
 
-&dai_mi2s2 {
-	qcom,msm-mi2s-tx-lines = <1>;
+&dai_mi2s2_tx {
+	qcom,msm-mi2s-lines = <1>;
 	pinctrl-names = "default", "sleep";
 	pinctrl-0 = <&tert_mi2s_sck_active &tert_mi2s_ws_active
 			&tert_mi2s_sd0_active>;
diff --git a/arch/arm64/boot/dts/vendor/qcom/shima-audio.dtsi b/arch/arm64/boot/dts/vendor/qcom/shima-audio.dtsi
index 10ee18cc06de..5fd0a1fa60db 100644
--- a/arch/arm64/boot/dts/vendor/qcom/shima-audio.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/shima-audio.dtsi
@@ -180,9 +180,13 @@
 				"msm-pcm-routing", "msm-compr-dsp",
 				"msm-pcm-dsp-noirq";
 		asoc-cpu = <&dai_dp>, <&dai_dp1>,
-				<&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_mi2s4>, <&dai_mi2s5>, <&dai_pri_auxpcm>,
+				<&dai_mi2s0_rx>, <&dai_mi2s0_tx>,
+				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,
+				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,
+				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,
+				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,
+				<&dai_mi2s5_rx>, <&dai_mi2s5_tx>,
+				<&dai_pri_auxpcm>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
 				<&dai_sen_auxpcm>,
@@ -217,6 +221,9 @@
 				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
 				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
 				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",
+				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",
+				"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",
+				"msm-dai-q6-mi2s.10", "msm-dai-q6-mi2s.11",
 				"msm-dai-q6-auxpcm.1",
 				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",
 				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",
diff --git a/arch/arm64/boot/dts/vendor/qcom/shima-idp.dtsi b/arch/arm64/boot/dts/vendor/qcom/shima-idp.dtsi
index 728936ec43b3..0b0623b7f2b3 100644
--- a/arch/arm64/boot/dts/vendor/qcom/shima-idp.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/shima-idp.dtsi
@@ -223,8 +223,8 @@
 	};
 };
 
-&dai_mi2s2 {
-	qcom,msm-mi2s-tx-lines = <1>;
+&dai_mi2s2_tx {
+	qcom,msm-mi2s-lines = <1>;
 	pinctrl-names = "default", "sleep";
 	pinctrl-0 = <&tert_mi2s_sck_active &tert_mi2s_ws_active
 			&tert_mi2s_sd0_active>;
diff --git a/arch/arm64/boot/dts/vendor/qcom/shima-qrd.dtsi b/arch/arm64/boot/dts/vendor/qcom/shima-qrd.dtsi
index 926f4c272a16..1621cfee40db 100644
--- a/arch/arm64/boot/dts/vendor/qcom/shima-qrd.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/shima-qrd.dtsi
@@ -467,8 +467,8 @@
 				  <&bolero>;
 };
 
-&dai_mi2s2 {
-	qcom,msm-mi2s-tx-lines = <1>;
+&dai_mi2s2_tx {
+	qcom,msm-mi2s-lines = <1>;
 	pinctrl-names = "default", "sleep";
 	pinctrl-0 = <&tert_mi2s_sck_active &tert_mi2s_ws_active
 			&tert_mi2s_sd0_active>;
diff --git a/arch/arm64/boot/dts/vendor/qcom/yupik-audio-overlay.dtsi b/arch/arm64/boot/dts/vendor/qcom/yupik-audio-overlay.dtsi
index c3de58d5aa40..8a69b60a5f3f 100644
--- a/arch/arm64/boot/dts/vendor/qcom/yupik-audio-overlay.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/yupik-audio-overlay.dtsi
@@ -488,9 +488,12 @@
 	};
 };
 
-&dai_mi2s1 {
-	qcom,msm-mi2s-rx-lines = <0>;
-	qcom,msm-mi2s-tx-lines = <1>;
+&dai_mi2s1_rx {
+	qcom,msm-mi2s-lines = <0>;
+};
+
+&dai_mi2s1_tx {
+	qcom,msm-mi2s-lines = <1>;
 };
 
 &adsp_loader {
diff --git a/arch/arm64/boot/dts/vendor/qcom/yupik-audio.dtsi b/arch/arm64/boot/dts/vendor/qcom/yupik-audio.dtsi
index 6800853aaaf6..865416bd4f7e 100644
--- a/arch/arm64/boot/dts/vendor/qcom/yupik-audio.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/yupik-audio.dtsi
@@ -180,9 +180,13 @@
 				"msm-pcm-routing", "msm-compr-dsp",
 				"msm-pcm-dsp-noirq";
 		asoc-cpu = <&dai_dp>, <&dai_dp1>,
-				<&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_mi2s4>, <&dai_mi2s5>, <&dai_pri_auxpcm>,
+				<&dai_mi2s0_rx>, <&dai_mi2s0_tx>,
+				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,
+				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,
+				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,
+				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,
+				<&dai_mi2s5_rx>, <&dai_mi2s5_tx>,
+				<&dai_pri_auxpcm>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
 				<&dai_sen_auxpcm>,
@@ -217,6 +221,9 @@
 				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
 				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
 				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",
+				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",
+				"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",
+				"msm-dai-q6-mi2s.10", "msm-dai-q6-mi2s.11",
 				"msm-dai-q6-auxpcm.1",
 				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",
 				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",
diff --git a/arch/arm64/boot/dts/vendor/qcom/yupik-gpu.dtsi b/arch/arm64/boot/dts/vendor/qcom/yupik-gpu.dtsi
index c6542a40b826..c8a93bd66ed6 100644
--- a/arch/arm64/boot/dts/vendor/qcom/yupik-gpu.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/yupik-gpu.dtsi
@@ -57,8 +57,8 @@
 		qcom,min-access-length = <32>;
 		qcom,ubwc-mode = <3>;
 
-		nvmem-cells = <&gpu_speed_bin>, <&gpu_gaming_bin>;
-		nvmem-cell-names = "speed_bin", "gaming_bin";
+		nvmem-cells = <&gpu_speed_bin>, <&gpu_gaming_bin>, <&gpu_model_bin>;
+		nvmem-cell-names = "speed_bin", "gaming_bin", "gpu_model";
 
 		qcom,tzone-names = "gpuss-0-usr", "gpuss-1-usr";
 
@@ -119,6 +119,26 @@
 			};
 		};
 
+		qcom,gpu-models {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible="qcom,gpu-models";
+
+			qcom,gpu-model@0 {
+				compatible="qcom,adreno-gpu-a643";
+				qcom,gpu-model-id = <172>;
+				qcom,gpu-model = "Adreno643v1";
+				qcom,vk-device-id = <0x06030501>;
+			};
+
+			qcom,gpu-model@1 {
+				compatible="qcom,adreno-gpu-a643";
+				qcom,gpu-model-id = <190>;
+				qcom,gpu-model = "Adreno643v1";
+				qcom,vk-device-id = <0x06030501>;
+			};
+		};
+
 		qcom,gpu-mempools {
 			#address-cells = <1>;
 			#size-cells = <0>;
diff --git a/arch/arm64/boot/dts/vendor/qcom/yupik-hsp.dts b/arch/arm64/boot/dts/vendor/qcom/yupik-hsp.dts
index da97abe6dc64..74b8ca2b9e73 100644
--- a/arch/arm64/boot/dts/vendor/qcom/yupik-hsp.dts
+++ b/arch/arm64/boot/dts/vendor/qcom/yupik-hsp.dts
@@ -4,6 +4,6 @@
 
 / {
 	model = "Qualcomm Technologies, Inc. Yupik IDP HSP + SoC";
-	compatible = "qcom,yupik-idp", "qcom,yupik", "qcom,idp";
+	compatible = "qcom,yupik";
 	qcom,board-id = <0 1>;
 };
diff --git a/arch/arm64/boot/dts/vendor/qcom/yupik-iot-hsp-pm7250b-overlay.dts b/arch/arm64/boot/dts/vendor/qcom/yupik-iot-hsp-pm7250b-overlay.dts
new file mode 100644
index 000000000000..13601736b210
--- /dev/null
+++ b/arch/arm64/boot/dts/vendor/qcom/yupik-iot-hsp-pm7250b-overlay.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+/plugin/;
+
+#include "yupik-iot-hsp-pm7250b.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Yupik IOT HSP + PM7250B";
+	compatible = "qcom,yupik-iot-idp", "qcom,yupik-iot", "qcom,idp";
+	qcom,msm-id = <497 0x10000>;
+	qcom,board-id = <34 1>;
+};
diff --git a/arch/arm64/boot/dts/vendor/qcom/yupik-iot-hsp-pm7250b.dts b/arch/arm64/boot/dts/vendor/qcom/yupik-iot-hsp-pm7250b.dts
new file mode 100644
index 000000000000..e45c59ae88d3
--- /dev/null
+++ b/arch/arm64/boot/dts/vendor/qcom/yupik-iot-hsp-pm7250b.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "yupik-iot.dtsi"
+#include "yupik-iot-hsp-pm7250b.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Yupik IOT HSP + PM7250B";
+	compatible = "qcom,yupik-iot-idp", "qcom,yupik-iot", "qcom,idp";
+	qcom,board-id = <34 1>;
+};
diff --git a/arch/arm64/boot/dts/vendor/qcom/yupik-iot-hsp-pm7250b.dtsi b/arch/arm64/boot/dts/vendor/qcom/yupik-iot-hsp-pm7250b.dtsi
new file mode 100644
index 000000000000..de87bb60607e
--- /dev/null
+++ b/arch/arm64/boot/dts/vendor/qcom/yupik-iot-hsp-pm7250b.dtsi
@@ -0,0 +1,63 @@
+#include <dt-bindings/interconnect/qcom,yupik.h>
+#include "yupik-iot-idp-pm7250b.dtsi"
+#include "qcx6490-cnss.dtsi"
+
+&pcie0 {
+	status = "ok";
+};
+
+&pcie0_msi {
+	status = "ok";
+};
+
+&pcie1 {
+	status = "ok";
+	qcom,boot-option = <0x0>;
+	qcom,ep-gpio = <&tlmm 19 0>;
+	pinctrl-0 = <&pcie1_perst_default
+			&pcie1_clkreq_default
+			&pcie1_wake_default
+			&pcie1_ep_default>;
+	pinctrl-1 = <&pcie1_perst_default
+			&pcie1_clkreq_sleep
+			&pcie1_wake_default
+			&pcie1_ep_default>;
+};
+
+&pcie1_msi {
+	status = "ok";
+};
+
+&pm7325_gpios {
+	usb2_vbus_boost {
+		usb2_vbus_boost_default: usb2_vbus_boost_default {
+			pins = "gpio8";
+			function = "normal";
+			output-low;
+			power-source = <0>;	/* 1.8V input supply */
+		};
+	};
+};
+
+&soc {
+	usb2_vbus_boost_reg: usb2_vbus_boost_reg {
+		compatible = "regulator-fixed";
+		regulator-name = "usb2_vbus_boost_vreg";
+		startup-delay-us = <4000>;
+		enable-active-high;
+		gpios = <&pm7325_gpios 8 0>;
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&usb2_vbus_boost_default>;
+	};
+};
+
+&usb1 {
+	vbus_dwc3-supply = <&usb2_vbus_boost_reg>;
+	qcom,default-mode-none;
+	status = "ok";
+};
+
+&usb2_phy1 {
+	status = "ok";
+};
diff --git a/arch/arm64/boot/dts/vendor/qcom/yupik-iot-hsp.dtsi b/arch/arm64/boot/dts/vendor/qcom/yupik-iot-hsp.dtsi
index f87450ed785b..b4cf6a1a5007 100644
--- a/arch/arm64/boot/dts/vendor/qcom/yupik-iot-hsp.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/yupik-iot-hsp.dtsi
@@ -1,4 +1,65 @@
 #include "yupik-iot-idp.dtsi"
+#include "qcx6490-cnss.dtsi"
 
 &soc {
 };
+
+&pcie0 {
+	status = "ok";
+};
+
+&pcie0_msi {
+	status = "ok";
+};
+
+&pcie1 {
+	status = "ok";
+	qcom,boot-option = <0x0>;
+	qcom,ep-gpio = <&tlmm 19 0>;
+	pinctrl-0 = <&pcie1_perst_default
+			&pcie1_clkreq_default
+			&pcie1_wake_default
+			&pcie1_ep_default>;
+	pinctrl-1 = <&pcie1_perst_default
+			&pcie1_clkreq_sleep
+			&pcie1_wake_default
+			&pcie1_ep_default>;
+};
+
+&pcie1_msi {
+	status = "ok";
+};
+
+&pm7325_gpios {
+	usb2_vbus_boost {
+		usb2_vbus_boost_default: usb2_vbus_boost_default {
+			pins = "gpio8";
+			function = "normal";
+			output-low;
+			power-source = <0>;	/* 1.8V input supply */
+		};
+	};
+};
+
+&soc {
+	usb2_vbus_boost_reg: usb2_vbus_boost_reg {
+		compatible = "regulator-fixed";
+		regulator-name = "usb2_vbus_boost_vreg";
+		startup-delay-us = <4000>;
+		enable-active-high;
+		gpios = <&pm7325_gpios 8 0>;
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&usb2_vbus_boost_default>;
+	};
+};
+
+&usb1 {
+	vbus_dwc3-supply = <&usb2_vbus_boost_reg>;
+	qcom,default-mode-none;
+	status = "ok";
+};
+
+&usb2_phy1 {
+	status = "ok";
+};
diff --git a/arch/arm64/boot/dts/vendor/qcom/yupik-iot-idp-pm7250b-overlay.dts b/arch/arm64/boot/dts/vendor/qcom/yupik-iot-idp-pm7250b-overlay.dts
new file mode 100644
index 000000000000..30427232e379
--- /dev/null
+++ b/arch/arm64/boot/dts/vendor/qcom/yupik-iot-idp-pm7250b-overlay.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+/plugin/;
+
+#include "yupik-iot-idp-pm7250b.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Yupik IOT IDP + PM7250B";
+	compatible = "qcom,yupik-iot-idp", "qcom,yupik-iot", "qcom,idp";
+	qcom,msm-id = <497 0x10000>;
+	qcom,board-id = <34 0>;
+};
diff --git a/arch/arm64/boot/dts/vendor/qcom/yupik-iot-idp-pm7250b.dts b/arch/arm64/boot/dts/vendor/qcom/yupik-iot-idp-pm7250b.dts
new file mode 100644
index 000000000000..02b9e75ec6ef
--- /dev/null
+++ b/arch/arm64/boot/dts/vendor/qcom/yupik-iot-idp-pm7250b.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "yupik-iot.dtsi"
+#include "yupik-iot-idp-pm7250b.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Yupik IOT IDP + PM7250B";
+	compatible = "qcom,yupik-iot-idp", "qcom,yupik-iot", "qcom,idp";
+	qcom,board-id = <34 0>;
+};
diff --git a/arch/arm64/boot/dts/vendor/qcom/yupik-iot-idp-pm7250b.dtsi b/arch/arm64/boot/dts/vendor/qcom/yupik-iot-idp-pm7250b.dtsi
new file mode 100644
index 000000000000..3d7faf4c3695
--- /dev/null
+++ b/arch/arm64/boot/dts/vendor/qcom/yupik-iot-idp-pm7250b.dtsi
@@ -0,0 +1 @@
+#include "yupik-idp-pm7250b.dtsi"
diff --git a/arch/arm64/boot/dts/vendor/qcom/yupik-iot-idp.dtsi b/arch/arm64/boot/dts/vendor/qcom/yupik-iot-idp.dtsi
index 45b0b4e4718f..aeef58f4f289 100644
--- a/arch/arm64/boot/dts/vendor/qcom/yupik-iot-idp.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/yupik-iot-idp.dtsi
@@ -1,62 +1 @@
 #include "yupik-idp.dtsi"
-#include "qcx6490-cnss.dtsi"
-
-&pcie0 {
-	status = "ok";
-};
-
-&pcie0_msi {
-	status = "ok";
-};
-
-&pcie1 {
-	status = "ok";
-	qcom,boot-option = <0x0>;
-	qcom,ep-gpio = <&tlmm 19 0>;
-	pinctrl-0 = <&pcie1_perst_default
-			&pcie1_clkreq_default
-			&pcie1_wake_default
-			&pcie1_ep_default>;
-	pinctrl-1 = <&pcie1_perst_default
-			&pcie1_clkreq_sleep
-			&pcie1_wake_default
-			&pcie1_ep_default>;
-};
-
-&pcie1_msi {
-	status = "ok";
-};
-
-&pm7325_gpios {
-	usb2_vbus_boost {
-		usb2_vbus_boost_default: usb2_vbus_boost_default {
-			pins = "gpio8";
-			function = "normal";
-			output-low;
-			power-source = <0>;	/* 1.8V input supply */
-		};
-	};
-};
-
-&soc {
-	usb2_vbus_boost_reg: usb2_vbus_boost_reg {
-		compatible = "regulator-fixed";
-		regulator-name = "usb2_vbus_boost_vreg";
-		startup-delay-us = <4000>;
-		enable-active-high;
-		gpios = <&pm7325_gpios 8 0>;
-
-		pinctrl-names = "default";
-		pinctrl-0 = <&usb2_vbus_boost_default>;
-	};
-};
-
-&usb1 {
-	vbus_dwc3-supply = <&usb2_vbus_boost_reg>;
-	qcom,default-mode-none;
-	status = "ok";
-};
-
-&usb2_phy1 {
-	status = "ok";
-};
diff --git a/arch/arm64/boot/dts/vendor/qcom/yupik-pinctrl.dtsi b/arch/arm64/boot/dts/vendor/qcom/yupik-pinctrl.dtsi
index 9cc831f32f2f..85d64c6d5ce4 100644
--- a/arch/arm64/boot/dts/vendor/qcom/yupik-pinctrl.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/yupik-pinctrl.dtsi
@@ -8,7 +8,6 @@
 		interrupt-controller;
 		#interrupt-cells = <2>;
 		wakeup-parent = <&pdc>;
-		qcom,tlmm-mpm-wake-control;
 
 		qupv3_se0_i2c_pins: qupv3_se0_i2c_pins {
 			qupv3_se0_i2c_active: qupv3_se0_i2c_active {
diff --git a/arch/arm64/boot/dts/vendor/qcom/yupik-regulators.dtsi b/arch/arm64/boot/dts/vendor/qcom/yupik-regulators.dtsi
index d3964932dad7..aabf6d843478 100644
--- a/arch/arm64/boot/dts/vendor/qcom/yupik-regulators.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/yupik-regulators.dtsi
@@ -46,6 +46,11 @@
 	rpmh-regulator-smpb8 {
 		compatible = "qcom,rpmh-vrm-regulator";
 		qcom,resource-name = "smpb8";
+		qcom,regulator-type = "pmic5-hfsmps";
+		qcom,supported-modes =
+			<RPMH_REGULATOR_MODE_RET
+			RPMH_REGULATOR_MODE_AUTO>;
+		qcom,mode-threshold-currents = <0 200000>;
 		S8B:
 		pm7325_s8: regulator-pm7325-s8 {
 			regulator-name = "pm7325_s8";
@@ -53,6 +58,7 @@
 			regulator-min-microvolt = <1200000>;
 			regulator-max-microvolt = <1500000>;
 			qcom,init-voltage = <1272000>;
+			qcom,init-mode = <RPMH_REGULATOR_MODE_RET>;
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/vendor/qcom/yupik.dtsi b/arch/arm64/boot/dts/vendor/qcom/yupik.dtsi
index 458ae1fc0cb8..e0e6a00dbd12 100644
--- a/arch/arm64/boot/dts/vendor/qcom/yupik.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/yupik.dtsi
@@ -5047,6 +5047,11 @@
 			bits = <5 1>;
 		};
 
+		gpu_model_bin: gpu_model_bin@1e9 {
+			reg = <0x1e9 0x2>;
+			bits = <5 8>;
+		};
+
 		feat_conf_m7: feat_conf_m7@6020 {
 			reg = <0x6020 0x4>;
 		};
diff --git a/arch/arm64/boot/dts/vendor/qcom/yupikp-hsp.dts b/arch/arm64/boot/dts/vendor/qcom/yupikp-hsp.dts
index 4d0392c3605f..798f668af4b8 100644
--- a/arch/arm64/boot/dts/vendor/qcom/yupikp-hsp.dts
+++ b/arch/arm64/boot/dts/vendor/qcom/yupikp-hsp.dts
@@ -4,6 +4,6 @@
 
 / {
 	model = "Qualcomm Technologies, Inc. YupikP IDP HSP + SoC";
-	compatible = "qcom,yupikp-idp", "qcom,yupikp", "qcom,idp";
+	compatible = "qcom,yupikp";
 	qcom,board-id = <0 1>;
 };
diff --git a/arch/arm64/boot/dts/vendor/qcom/yupikp-iot-hsp-pm7250b-overlay.dts b/arch/arm64/boot/dts/vendor/qcom/yupikp-iot-hsp-pm7250b-overlay.dts
new file mode 100644
index 000000000000..657d8bcd6537
--- /dev/null
+++ b/arch/arm64/boot/dts/vendor/qcom/yupikp-iot-hsp-pm7250b-overlay.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+/plugin/;
+
+#include "yupikp-iot-hsp-pm7250b.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. YupikP IOT HSP + PM7250B";
+	compatible = "qcom,yupikp-iot-idp", "qcom,yupikp-iot", "qcom,idp";
+	qcom,msm-id = <498 0x10000>;
+	qcom,board-id = <34 1>;
+};
diff --git a/arch/arm64/boot/dts/vendor/qcom/yupikp-iot-hsp-pm7250b.dts b/arch/arm64/boot/dts/vendor/qcom/yupikp-iot-hsp-pm7250b.dts
new file mode 100644
index 000000000000..1ebf928ea380
--- /dev/null
+++ b/arch/arm64/boot/dts/vendor/qcom/yupikp-iot-hsp-pm7250b.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "yupikp-iot.dtsi"
+#include "yupikp-iot-hsp-pm7250b.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. YupikP IOT HSP + PM7250B";
+	compatible = "qcom,yupikp-iot-idp", "qcom,yupikp-iot", "qcom,idp";
+	qcom,board-id = <34 1>;
+};
diff --git a/arch/arm64/boot/dts/vendor/qcom/yupikp-iot-hsp-pm7250b.dtsi b/arch/arm64/boot/dts/vendor/qcom/yupikp-iot-hsp-pm7250b.dtsi
new file mode 100644
index 000000000000..06877e6b4c19
--- /dev/null
+++ b/arch/arm64/boot/dts/vendor/qcom/yupikp-iot-hsp-pm7250b.dtsi
@@ -0,0 +1 @@
+#include "yupik-iot-hsp-pm7250b.dtsi"
diff --git a/arch/arm64/boot/dts/vendor/qcom/yupikp-iot-hsp.dtsi b/arch/arm64/boot/dts/vendor/qcom/yupikp-iot-hsp.dtsi
index b5ec1077fad6..c6691ce617b1 100644
--- a/arch/arm64/boot/dts/vendor/qcom/yupikp-iot-hsp.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/yupikp-iot-hsp.dtsi
@@ -1 +1,62 @@
 #include "yupikp-iot-idp.dtsi"
+#include "qcx6490-cnss.dtsi"
+
+&pcie0 {
+	status = "ok";
+};
+
+&pcie0_msi {
+	status = "ok";
+};
+
+&pcie1 {
+	status = "ok";
+	qcom,boot-option = <0x0>;
+	qcom,ep-gpio = <&tlmm 19 0>;
+	pinctrl-0 = <&pcie1_perst_default
+			&pcie1_clkreq_default
+			&pcie1_wake_default
+			&pcie1_ep_default>;
+	pinctrl-1 = <&pcie1_perst_default
+			&pcie1_clkreq_sleep
+			&pcie1_wake_default
+			&pcie1_ep_default>;
+};
+
+&pcie1_msi {
+	status = "ok";
+};
+
+&pm7325_gpios {
+	usb2_vbus_boost {
+		usb2_vbus_boost_default: usb2_vbus_boost_default {
+			pins = "gpio8";
+			function = "normal";
+			output-low;
+			power-source = <0>;	/* 1.8V input supply */
+		};
+	};
+};
+
+&soc {
+	usb2_vbus_boost_reg: usb2_vbus_boost_reg {
+		compatible = "regulator-fixed";
+		regulator-name = "usb2_vbus_boost_vreg";
+		startup-delay-us = <4000>;
+		enable-active-high;
+		gpios = <&pm7325_gpios 8 0>;
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&usb2_vbus_boost_default>;
+	};
+};
+
+&usb1 {
+	vbus_dwc3-supply = <&usb2_vbus_boost_reg>;
+	qcom,default-mode-none;
+	status = "ok";
+};
+
+&usb2_phy1 {
+	status = "ok";
+};
diff --git a/arch/arm64/boot/dts/vendor/qcom/yupikp-iot-idp-pm7250b-overlay.dts b/arch/arm64/boot/dts/vendor/qcom/yupikp-iot-idp-pm7250b-overlay.dts
new file mode 100644
index 000000000000..9b6f4f250fef
--- /dev/null
+++ b/arch/arm64/boot/dts/vendor/qcom/yupikp-iot-idp-pm7250b-overlay.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+/plugin/;
+
+#include "yupikp-iot-idp-pm7250b.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. YupikP IOT IDP + PM7250B";
+	compatible = "qcom,yupikp-iot-idp", "qcom,yupikp-iot", "qcom,idp";
+	qcom,msm-id = <498 0x10000>;
+	qcom,board-id = <34 0>;
+};
diff --git a/arch/arm64/boot/dts/vendor/qcom/yupikp-iot-idp-pm7250b.dts b/arch/arm64/boot/dts/vendor/qcom/yupikp-iot-idp-pm7250b.dts
new file mode 100644
index 000000000000..250910551c11
--- /dev/null
+++ b/arch/arm64/boot/dts/vendor/qcom/yupikp-iot-idp-pm7250b.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "yupikp-iot.dtsi"
+#include "yupikp-iot-idp-pm7250b.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. YupikP IOT IDP + PM7250B";
+	compatible = "qcom,yupikp-iot-idp", "qcom,yupikp-iot", "qcom,idp";
+	qcom,board-id = <34 0>;
+};
diff --git a/arch/arm64/boot/dts/vendor/qcom/yupikp-iot-idp-pm7250b.dtsi b/arch/arm64/boot/dts/vendor/qcom/yupikp-iot-idp-pm7250b.dtsi
new file mode 100644
index 000000000000..b1d6a3003180
--- /dev/null
+++ b/arch/arm64/boot/dts/vendor/qcom/yupikp-iot-idp-pm7250b.dtsi
@@ -0,0 +1 @@
+#include "yupik-iot-idp-pm7250b.dtsi"
diff --git a/arch/arm64/boot/dts/vendor/qcom/yupikp-iot-idp.dtsi b/arch/arm64/boot/dts/vendor/qcom/yupikp-iot-idp.dtsi
index bc2beeb0b0ff..0790cb6d4444 100644
--- a/arch/arm64/boot/dts/vendor/qcom/yupikp-iot-idp.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/yupikp-iot-idp.dtsi
@@ -1,10 +1 @@
 #include "yupikp-idp.dtsi"
-#include "qcx6490-cnss.dtsi"
-
-&pcie0 {
-	status = "ok";
-};
-
-&pcie0_msi {
-	status = "ok";
-};