commit 5b1a9d70d873f0376047e3328e2e0e042b360364 (tag: r00168.1)

Author: QC Publisher <qcpublisher@qti.qualcomm.com> Date: Wed Apr 27 14:26:00 2022 -0700 Commit label r00168.1 - Pre-CS 0.0.168.1 TRACKING-ID:ab28d0e6-629f-45e2-bc47-ae93cee6855d
author: QC Publisher <qcpublisher@qti.qualcomm.com> 2022-04-27 14:26:00 -0700
committer: Andrew Evans <andrewevans@google.com> 2022-05-11 19:20:37 -0700
commit: a1db91e244fb83cfdfdd181b0294c3926c0675cc (patch)
tree: dcc99e5d049f45163175a10bc6aa9cdeb53046b5
parent: 0ab0ff32e282ff7e00e26a6760a6724ca93c0a5f (diff)
download: devicetree-a1db91e244fb83cfdfdd181b0294c3926c0675cc.tar.gz
101 files changed, 3963 insertions, 463 deletions
diff --git a/bindings/arm/msm/msm.txt b/bindings/arm/msm/msm.txt
index ebfa2682..2e076396 100755
--- a/bindings/arm/msm/msm.txt
+++ b/bindings/arm/msm/msm.txt
@@ -172,6 +172,8 @@ Generic board variants:
 - SA2150P
   compatible = "qcom,sa2150p"
 
+- OPK device:
+  compatible = "qcom,opk"
 
 Boards (SoC type + board variant):
 
@@ -285,6 +287,7 @@ compatible = "qcom,sa6155p-adp-air"
 compatible = "qcom,qcs610"
 compatible = "qcom,qcs610-iot"
 compatible = "qcom,qcs610-idp"
+compatible = "qcom,qcs610-opk"
 compatible = "qcom,qcs405-rumi"
 compatible = "qcom,qcs405-iot"
 compatible = "qcom,sa2150p-ccard"
@@ -294,6 +297,7 @@ compatible = "qcom,adp-star"
 compatible = "qcom,sdxprairie-rumi"
 compatible = "qcom,sdxprairie-mtp"
 compatible = "qcom,sdxprairie-cdp"
+compatible = "qcom,sa515m-ccard"
 compatible = "qcom,sdxlemur-rumi"
 compatible = "qcom,sdxlemur-atp"
 compatible = "qcom,sdxlemur-mtp"
diff --git a/bindings/clock/qcom,camcc.txt b/bindings/clock/qcom,camcc.txt
index 2757d0fe..6d16cf78 100755
--- a/bindings/clock/qcom,camcc.txt
+++ b/bindings/clock/qcom,camcc.txt
@@ -18,6 +18,7 @@ Required properties :
 			"qcom,sa6155-camcc"
 			"qcom,sa6155-camcc"
 			"qcom,direwolf-camcc"
+			"qcom,lemans-camcc"
 
 - reg : shall contain base register location and length.
 - reg-names: names of registers listed in the same order as in
diff --git a/bindings/clock/qcom,debugcc.txt b/bindings/clock/qcom,debugcc.txt
index ed9acab9..84c29da2 100755
--- a/bindings/clock/qcom,debugcc.txt
+++ b/bindings/clock/qcom,debugcc.txt
@@ -19,6 +19,7 @@ Required properties :
 			"qcom,scuba-debugcc"
 			"qcom,qcs404-debugcc"
 			"qcom,bengal-debugcc"
+			"qcom,lemans-debugcc"
 
 - qcom,gcc: phandle to the GCC device node.
 - qcom,videocc: phandle to the Video CC device node.
diff --git a/bindings/clock/qcom,dispcc.txt b/bindings/clock/qcom,dispcc.txt
index 13f410f7..bca578bc 100755
--- a/bindings/clock/qcom,dispcc.txt
+++ b/bindings/clock/qcom,dispcc.txt
@@ -22,6 +22,8 @@ Required properties :
 			"qcom,direwolf-dispcc0"
 			"qcom,direwolf-dispcc1"
 			"qcom,bengal-dispcc"
+			"qcom,lemans-dispcc0"
+			"qcom,lemans-dispcc1"
 
 - reg : shall contain base register location and length.
 - #clock-cells : from common clock binding, shall contain 1.
diff --git a/bindings/clock/qcom,gcc.txt b/bindings/clock/qcom,gcc.txt
index 6663e5ab..d0f0fe10 100755
--- a/bindings/clock/qcom,gcc.txt
+++ b/bindings/clock/qcom,gcc.txt
@@ -43,6 +43,7 @@ Required properties :
 			"qcom,scuba-gcc"
 			"qcom,qcs404-gcc-mdss"
 			"qcom,bengal-gcc"
+			"qcom,lemans-gcc"
 
 - reg : shall contain base register location and length
 - vdd_cx-supply: The vdd_cx logic rail supply.
diff --git a/bindings/clock/qcom,gpucc.txt b/bindings/clock/qcom,gpucc.txt
index 3c2a4e69..330a7349 100755
--- a/bindings/clock/qcom,gpucc.txt
+++ b/bindings/clock/qcom,gpucc.txt
@@ -18,6 +18,7 @@ Required properties :
 		"qcom,bengal-gpucc"
 		"qcom,direwolf-gpucc"
 		"qcom,direwolf-gpucc-v2"
+		"qcom,lemans-gpucc"
 
 - reg: shall contain base register offset and size.
 - reg-names: names of registers listed in the same order as in the reg property.
diff --git a/bindings/clock/qcom,rpmh-clk.txt b/bindings/clock/qcom,rpmh-clk.txt
index 0cab1fe5..348a4d82 100755
--- a/bindings/clock/qcom,rpmh-clk.txt
+++ b/bindings/clock/qcom,rpmh-clk.txt
@@ -16,6 +16,7 @@ Required properties :
 		"qcom,sdxlemur-rpmh-clk"
 		"qcom,yupik-rpmh-clk"
 		"qcom,direwolf-rpmh-clk"
+		"qcom,lemans-rpmh-clk"
 
 - #clock-cells : must contain 1
 
diff --git a/bindings/clock/qcom,videocc.txt b/bindings/clock/qcom,videocc.txt
index 6cfab423..31787f18 100755
--- a/bindings/clock/qcom,videocc.txt
+++ b/bindings/clock/qcom,videocc.txt
@@ -16,6 +16,7 @@ Required properties :
 			"qcom,sa6155-videocc"
 			"qcom,direwolf-videocc"
 			"qcom,direwolf-videocc-v2"
+			"qcom,lemans-videocc"
 
 - reg : shall contain base register location and length
 - #clock-cells : from common clock binding, shall contain 1.
diff --git a/bindings/power/supply/qcom/qcom,qbg.yaml b/bindings/power/supply/qcom/qcom,qbg.yaml
index c536326a..9875910c 100755
--- a/bindings/power/supply/qcom/qcom,qbg.yaml
+++ b/bindings/power/supply/qcom/qcom,qbg.yaml
@@ -75,13 +75,20 @@ properties:
     description: Resistance of the battery connector in mOhms.
 
   nvmem-cell-names:
-    $ref: /schemas/types.yaml#/definitions/string-array
-    description: The nvmem cell device name of the SDAM register used to store
-	the qbg debug mask.
+    minItems: 2
+    maxItems: 3
+    items:
+      - const: qbg_debug_mask_low
+      - const: qbg_debug_mask_high
+      - const: skip_esr_state
 
   nvmem-cells:
-    $ref: /schemas/types.yaml#/definitions/phandle-array
-    description: Phandle of the nvmem cell device used to store the qbg debug mask.
+   minItems: 2
+   minItems: 3
+   description: |
+     Use nvmem cell device to indicate SDAM register.
+       qbg_debug_mask_low/qbg_debug_mask_high used to store the qbg debug mask
+       skip_esr_state used to get GPS de-modulating status
 
 required:
   - compatible
diff --git a/bindings/soc/qcom/blocknames.txt b/bindings/soc/qcom/blocknames.txt
deleted file mode 100755
index db6fc05c..00000000
--- a/bindings/soc/qcom/blocknames.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-* rename block devices
-
-Required properties:
-
-- compatible:	"qcom,blkdev-rename" compatibility string
-- actual-dev:	Name of the  disk assigned by generic driver
-- rename-dev:	Re-name of the disk to set for disks
-
-Example:
-
-rename_blk: rename_blk {
-		compatible = "qcom,blkdev-rename";
-		actual-dev = "vda", "vdb", "vdc",
-				"vdd", "vde", "vdf",
-				"vdg", "vdh";
-		rename-dev = "la_system", "la_userdata", "la_vendor",
-				"la_persist", "modem", "bluetooth",
-				"la_misc", "vbmeta";
-};
diff --git a/bindings/soc/qcom/rename_devices.txt b/bindings/soc/qcom/rename_devices.txt
new file mode 100755
index 00000000..8f62392f
--- /dev/null
+++ b/bindings/soc/qcom/rename_devices.txt
@@ -0,0 +1,34 @@
+* rename devices
+
+Required properties for block and net devices rename:
+
+- compatible:		"qcom,rename-devices" compatibility string
+- device-type:		Device type to be renamed and supported device-types are block and net
+- actual-dev:		Original name of the disk or network interface assigned by generic driver
+- rename-dev:		New name of the disk or network interface to set for disks or
+			network interfaces respectively
+- rename-dev-ab:	New name of the disk to set for a/b supported disks
+
+Example:
+
+rename_devices: rename_devices {
+		compatible = "qcom,rename-devices";
+		rename_blk: rename_blk {
+			device-type = "block";
+			actual-dev = "vda", "vdb", "vdc",
+					"vdd", "vde", "vdf",
+					"vdg", "vdh", "vdi";
+			rename-dev = "system", "userdata", "vendor",
+					"persist", "modem", "bluetooth",
+					"misc", "vbmeta";
+			rename-dev-ab = "super", "userdata", "metadata",
+					"persist", "modem_a", "bluetooth_a",
+					"misc", "vbmeta_a", "vbmeta_b";
+		};
+
+		rename_net: rename_net {
+			device-type = "net";
+			actual-dev = "eth0";
+			rename-dev = "eth1";
+		};
+};
diff --git a/qcom/Makefile b/qcom/Makefile
index 5ec412da..c1b1b5b8 100755
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -449,15 +449,18 @@ endif
 ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
 	dtbo-$(CONFIG_ARCH_SM6150) += \
 		qcs610-iot-overlay.dtbo \
-		prairie-iot-idp-overlay.dtbo
+		prairie-iot-idp-overlay.dtbo \
+		qcs610-opk-overlay.dtbo
 
 qcs610-iot-overlay.dtbo-base := qcs610.dtb
 prairie-iot-idp-overlay.dtbo-base := qcs610.dtb
+qcs610-opk-overlay.dtbo-base := qcs610.dtb
 
 else
 dtb-$(CONFIG_ARCH_SM6150)	+= \
 	qcs610-iot.dtb \
-	prairie-iot-idp.dtb
+	prairie-iot-idp.dtb \
+	qcs610-opk.dtb
 endif
 
 ifeq ($(CONFIG_ARCH_LAHAINA), y)
@@ -494,6 +497,17 @@ dtb-$(CONFIG_ARCH_SDXLEMUR) += sdxlemur-rumi.dtb \
 	sdxlemur-v2-rcm-pcie-ep.dtb \
 	sdxlemur-v2-rcm-rc.dtb
 
+dtb-$(CONFIG_ARCH_SA515M) += sa515m-ccard.dtb \
+	sa515m-ccard-eth-ep.dtb \
+	sa515m-ccard-pcie-ep.dtb \
+	sa515m-ccard-usb-ep.dtb \
+	sa515m-v2-ccard-eth-ep.dtb \
+	sa515m-v2-ccard-pcie-ep.dtb \
+	sa515m-v2-ccard-usb-ep.dtb \
+	sa515m-v2-ccard.dtb \
+	sa515m-v2-ttp-pcie-ep.dtb \
+	sa515m-v2-ttp-usb-ep.dtb \
+	sa515m-v2-ttp.dtb
 
 ifeq ($(CONFIG_ARCH_SHIMA), y)
 ifeq ($(CONFIG_ARCH_QTI_VM), y)
@@ -520,6 +534,39 @@ dtb-$(CONFIG_ARCH_QTI_VM) += yupik-vm-rumi.dtb \
 endif
 endif
 
+ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
+	dtbo-$(CONFIG_QTI_QUIN_GVM) += sa8155-vm-la-overlay.dtbo \
+	sa8155-vm-lv-overlay.dtbo \
+	sa8155-vm-la-mt-overlay.dtbo \
+	sa8155-vm-lv-mt-overlay.dtbo \
+	sa8195-vm-la-overlay.dtbo \
+	sa8195-vm-lv-overlay.dtbo \
+	sa8195-vm-la-mt-overlay.dtbo \
+	sa8195-vm-lv-mt-overlay.dtbo \
+	sa8195-vm-lv-lxc-overlay.dtbo \
+	sa6155p-vm-la-overlay.dtbo \
+	direwolf-vm-la-mt-overlay.dtbo \
+	direwolf-vm-la-overlay.dtbo \
+	direwolf-vm-la1-mt-overlay.dtbo \
+	direwolf-vm-lv-mt-overlay.dtbo \
+	direwolf-vm-lv-overlay.dtbo
+
+sa8155-vm-la-overlay.dtbo-base := sa8155-vm-la.dtb
+sa8155-vm-lv-overlay.dtbo-base := sa8155-vm-lv.dtb
+sa8155-vm-la-mt-overlay.dtbo-base := sa8155-vm-la-mt.dtb
+sa8155-vm-lv-mt-overlay.dtbo-base := sa8155-vm-lv-mt.dtb
+sa8195-vm-la-overlay.dtbo-base := sa8195-vm-la.dtb
+sa8195-vm-lv-overlay.dtbo-base := sa8195-vm-lv.dtb
+sa8195-vm-la-mt-overlay.dtbo-base := sa8195-vm-la-mt.dtb
+sa8195-vm-lv-mt-overlay.dtbo-base := sa8195-vm-lv-mt.dtb
+sa8195-vm-lv-lxc-overlay.dtbo-base := sa8195-vm-lv-lxc.dtb
+sa6155p-vm-la-overlay.dtbo-base := sa6155p-vm-la.dtb
+direwolf-vm-la-mt-overlay.dtbo-base := direwolf-vm-la-mt.dtb
+direwolf-vm-la-overlay.dtbo-base := direwolf-vm-la.dtb
+direwolf-vm-la1-mt-overlay.dtbo-base := direwolf-vm-la1-mt.dtb
+direwolf-vm-lv-mt-overlay.dtbo-base := direwolf-vm-lv-mt.dtb
+direwolf-vm-lv-overlay.dtbo-base := direwolf-vm-lv.dtb
+else
 dtb-$(CONFIG_QTI_QUIN_GVM) += sa8155-vm-la.dtb \
 	sa8155-vm-lv.dtb \
 	sa8155-vm-la-mt.dtb \
@@ -536,6 +583,7 @@ dtb-$(CONFIG_QTI_QUIN_GVM) += sa8155-vm-la.dtb \
 	direwolf-vm-la-mt.dtb \
 	direwolf-vm-la1-mt.dtb \
 	direwolf-vm-lv-mt.dtb
+endif
 
 ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
 	dtbo-$(CONFIG_ARCH_DIREWOLF) += direwolf-ivi-rumi-overlay.dtbo \
diff --git a/qcom/bengal-coresight.dtsi b/qcom/bengal-coresight.dtsi
index c5b6c25a..0f35764b 100755
--- a/qcom/bengal-coresight.dtsi
+++ b/qcom/bengal-coresight.dtsi
@@ -1287,6 +1287,10 @@
 
 		coresight-name = "coresight-tmc-etf";
 
+		coresight-ctis = <&cti0 &cti6>;
+		cti-flush-trig-num = <1>;
+		cti-reset-trig-num = <5>;
+
 		clocks = <&rpmcc RPM_SMD_QDSS_CLK>;
 		clock-names = "apb_pclk";
 		ports {
@@ -1365,7 +1369,10 @@
 		arm,buffer-size = <0x400000>;
 		arm,scatter-gather;
 
-		coresight-ctis = <&cti0>;
+		coresight-ctis = <&cti0 &cti6>;
+		cti-flush-trig-num = <3>;
+		cti-reset-trig-num = <5>;
+
 		coresight-csr = <&csr>;
 
 		clocks = <&rpmcc RPM_SMD_QDSS_CLK>;
diff --git a/qcom/bengal-pm.dtsi b/qcom/bengal-pm.dtsi
index dd87bb51..339885a9 100755
--- a/qcom/bengal-pm.dtsi
+++ b/qcom/bengal-pm.dtsi
@@ -1,122 +1,197 @@
 &soc {
 	qcom,lpm-levels {
 		compatible = "qcom,lpm-levels";
+		qcom,use-psci;
 		#address-cells = <1>;
 		#size-cells = <0>;
-
 		qcom,pm-cluster@0 {
 			reg = <0>;
 			#address-cells = <1>;
 			#size-cells = <0>;
-			idle-state-name = "L2";
-			qcom,psci-mode-shift = <4>;
+			idle-state-name = "system";
+			qcom,psci-mode-shift = <8>;
 			qcom,psci-mode-mask = <0xf>;
 
-			qcom,pm-cluster-level@0 { /* D1 */
+			qcom,pm-cluster-level@0 {
 				reg = <0>;
 				compatible = "arm,idle-state";
-				idle-state-name = "l2-wfi";
+				idle-state-name = "system-wfi";
+				qcom,psci-mode = <0x0>;
+				entry-latency-us = <640>;
+				exit-latency-us = <1654>;
+				min-residency-us = <2294>;
 				arm,psci-suspend-param = <0x10>;
-				qcom,psci-mode = <0x1>;
-				entry-latency-us = <38>;
-				exit-latency-us = <51>;
-				min-residency-us = <89>;
 			};
 
-			qcom,pm-cluster-level@1 { /* D3G */
+			qcom,pm-cluster-level@1 { /* E3 */
 				reg = <1>;
 				compatible = "arm,idle-state";
-				idle-state-name = "l2-gdhs";
-				arm,psci-suspend-param = <0x20>;
-				qcom,psci-mode = <0x2>;
-				entry-latency-us = <360>;
-				exit-latency-us = <421>;
-				min-residency-us = <782>;
-				qcom,min-child-idx = <1>;
-			};
-
-			qcom,pm-cluster-level@2 { /* D3 */
-				reg = <2>;
-				compatible = "arm,idle-state";
-				idle-state-name = "l2-pc";
-				arm,psci-suspend-param = <0x40>;
-				qcom,psci-mode = <0x4>;
-				entry-latency-us = <800>;
-				exit-latency-us = <2118>;
-				min-residency-us = <7376>;
-				qcom,min-child-idx = <1>;
+				idle-state-name = "system-pc";
+				qcom,psci-mode = <0x3>;
+				entry-latency-us = <10831>;
+				exit-latency-us = <4506>;
+				min-residency-us = <15338>;
+				arm,psci-suspend-param = <0x300>;
+				qcom,min-child-idx = <2>;
+				qcom,notify-rpm;
 				qcom,is-reset;
 			};
 
-			qcom,pm-cpu@0 {
+			qcom,pm-cluster@0 {
 				reg = <0>;
 				#address-cells = <1>;
 				#size-cells = <0>;
-				qcom,psci-mode-shift = <0>;
+				idle-state-name = "pwr";
+				qcom,spm-device-names = "l2";
+				qcom,psci-mode-shift = <4>;
 				qcom,psci-mode-mask = <0xf>;
-				label = "pwr";
-				qcom,disable-ipi-prediction;
-				qcom,cpu = <&CPU0 &CPU1 &CPU2 &CPU3>;
 
-				qcom,pm-cpu-level@0 { /* C1 */
+				qcom,pm-cluster-level@0 { /* D1 */
 					reg = <0>;
 					compatible = "arm,idle-state";
-					idle-state-name = "wfi";
-					entry-latency-us = <49>;
-					exit-latency-us = <42>;
-					min-residency-us = <91>;
-					arm,psci-suspend-param = <0x1>;
-					qcom,psci-cpu-mode = <0x1>;
+					idle-state-name = "pwr-l2-wfi";
+					qcom,psci-mode = <0x1>;
+					entry-latency-us = <38>;
+					exit-latency-us = <51>;
+					min-residency-us = <89>;
+					arm,psci-suspend-param = <0x10>;
 				};
 
-				qcom,pm-cpu-level@1 {  /* C3 */
+				qcom,pm-cluster-level@1 { /* D3G */
 					reg = <1>;
 					compatible = "arm,idle-state";
-					idle-state-name = "pc";
-					entry-latency-us = <290>;
-					exit-latency-us = <376>;
-					min-residency-us = <1182>;
-					qcom,psci-cpu-mode = <0x3>;
-					arm,psci-suspend-param = <0x40000003>;
-					local-timer-stop;
+					idle-state-name = "pwr-l2-gdhs";
+					qcom,psci-mode = <0x2>;
+					entry-latency-us = <360>;
+					exit-latency-us = <421>;
+					min-residency-us = <782>;
+					qcom,min-child-idx = <1>;
+					arm,psci-suspend-param = <0x20>;
+				};
+
+				qcom,pm-cluster-level@2 { /* D3 */
+					reg = <2>;
+					compatible = "arm,idle-state";
+					idle-state-name = "pwr-l2-pc";
+					qcom,psci-mode = <0x4>;
+					entry-latency-us = <800>;
+					exit-latency-us = <2118>;
+					min-residency-us = <7376>;
+					qcom,min-child-idx = <1>;
+					arm,psci-suspend-param = <0x40>;
 					qcom,is-reset;
-					qcom,use-broadcast-timer;
+				};
+
+				qcom,pm-cpu {
+					#address-cells = <1>;
+					#size-cells = <0>;
+					qcom,psci-mode-shift = <0>;
+					qcom,psci-mode-mask = <0xf>;
+					qcom,disable-ipi-prediction;
+					qcom,cpu = <&CPU0 &CPU1 &CPU2 &CPU3>;
+
+					qcom,pm-cpu-level@0 { /* C1 */
+						reg = <0>;
+						compatible = "arm,idle-state";
+						idle-state-name = "wfi";
+						qcom,psci-cpu-mode = <0x1>;
+						entry-latency-us = <49>;
+						exit-latency-us = <42>;
+						min-residency-us = <91>;
+						arm,psci-suspend-param = <0x1>;
+					};
+
+					qcom,pm-cpu-level@1 {  /* C3 */
+						reg = <1>;
+						compatible = "arm,idle-state";
+						idle-state-name = "pc";
+						qcom,psci-cpu-mode = <0x3>;
+						entry-latency-us = <290>;
+						exit-latency-us = <376>;
+						min-residency-us = <1182>;
+						qcom,is-reset;
+						qcom,use-broadcast-timer;
+						arm,psci-suspend-param = <0x40000003>;
+					};
 				};
 			};
 
-			qcom,pm-cpu@1 {
+			qcom,pm-cluster@1 {
 				reg = <1>;
 				#address-cells = <1>;
 				#size-cells = <0>;
-				qcom,psci-mode-shift = <0>;
+				idle-state-name = "perf";
+				qcom,spm-device-names = "l2";
+				qcom,psci-mode-shift = <4>;
 				qcom,psci-mode-mask = <0xf>;
-				label = "perf";
-				qcom,disable-ipi-prediction;
-				qcom,cpu = <&CPU4 &CPU5 &CPU6 &CPU7>;
 
-				qcom,pm-cpu-level@0 { /* C1 */
+				qcom,pm-cluster-level@0 {  /* D1 */
 					reg = <0>;
 					compatible = "arm,idle-state";
-					idle-state-name = "wfi";
-					arm,psci-suspend-param = <0x1>;
-					qcom,psci-cpu-mode = <0x1>;
-					entry-latency-us = <29>;
-					exit-latency-us = <39>;
-					min-residency-us = <68>;
+					idle-state-name = "perf-l2-wfi";
+					qcom,psci-mode = <0x1>;
+					entry-latency-us = <38>;
+					exit-latency-us = <51>;
+					min-residency-us = <89>;
+					arm,psci-suspend-param = <0x10>;
 				};
 
-				qcom,pm-cpu-level@1 { /* C3 */
+				qcom,pm-cluster-level@1 { /* D3G*/
 					reg = <1>;
 					compatible = "arm,idle-state";
-					idle-state-name = "pc";
-					arm,psci-suspend-param = <0x40000003>;
-					qcom,psci-cpu-mode = <0x3>;
-					entry-latency-us = <297>;
-					exit-latency-us = <324>;
-					min-residency-us = <1110>;
-					local-timer-stop;
+					idle-state-name = "perf-l2-gdhs";
+					qcom,psci-mode = <2>;
+					entry-latency-us = <314>;
+					exit-latency-us = <345>;
+					min-residency-us = <660>;
+					qcom,min-child-idx = <1>;
+					arm,psci-suspend-param = <0x40>;
+				};
+
+				qcom,pm-cluster-level@2 { /* D3 */
+					reg = <2>;
+					compatible = "arm,idle-state";
+					idle-state-name = "perf-l2-pc";
+					qcom,psci-mode = <0x4>;
+					entry-latency-us = <640>;
+					exit-latency-us = <1654>;
+					min-residency-us = <8094>;
+					arm,psci-suspend-param = <0x40>;
+					qcom,min-child-idx = <1>;
 					qcom,is-reset;
-					qcom,use-broadcast-timer;
+				};
+
+				qcom,pm-cpu {
+					#address-cells = <1>;
+					#size-cells = <0>;
+					qcom,psci-mode-shift = <0>;
+					qcom,psci-mode-mask = <0xf>;
+					qcom,disable-ipi-prediction;
+					qcom,cpu = <&CPU4 &CPU5 &CPU6 &CPU7>;
+
+					qcom,pm-cpu-level@0 { /* C1 */
+						reg = <0>;
+						compatible = "arm,idle-state";
+						idle-state-name = "wfi";
+						qcom,psci-cpu-mode = <0x1>;
+						entry-latency-us = <29>;
+						exit-latency-us = <39>;
+						min-residency-us = <68>;
+						arm,psci-suspend-param = <0x1>;
+					};
+
+					qcom,pm-cpu-level@1 { /* C3 */
+						reg = <1>;
+						compatible = "arm,idle-state";
+						idle-state-name = "pc";
+						qcom,psci-cpu-mode = <0x3>;
+						entry-latency-us = <297>;
+						exit-latency-us = <324>;
+						min-residency-us = <1110>;
+						arm,psci-suspend-param = <0x40000003>;
+						qcom,is-reset;
+						qcom,use-broadcast-timer;
+					};
 				};
 			};
 		};
@@ -135,3 +210,4 @@
 		qcom,master-offset = <4096>;
 	};
 };
+
diff --git a/qcom/bengal-qrd-v2.dtsi b/qcom/bengal-qrd-v2.dtsi
index 2567ec2f..e865c777 100755
--- a/qcom/bengal-qrd-v2.dtsi
+++ b/qcom/bengal-qrd-v2.dtsi
@@ -1,4 +1,5 @@
 #include "bengal-qrd.dtsi"
+#include "camera/bengal-camera-sensor-idp-v2.dtsi"
 
 &dsi_ili9881c_720p_video {
 	qcom,platform-reset-gpio = <&tlmm 97 0>;
diff --git a/qcom/bengal.dtsi b/qcom/bengal.dtsi
index 86d9461f..b599fc25 100755
--- a/qcom/bengal.dtsi
+++ b/qcom/bengal.dtsi
@@ -1030,12 +1030,9 @@
 	qcom_rng: qrng@1b53000 {
 		compatible = "qcom,msm-rng";
 		reg = <0x1b53000 0x1000>;
-		qcom,msm-rng-iface-clk;
 		interconnect-names = "data_path";
 		interconnects = <&bimc MASTER_AMPSS_M0 &config_noc SLAVE_HWKM_CORE>;
 		qcom,no-qrng-config;
-	//	clocks = <&gcc GCC_PRNG_AHB_CLK>;
-	//	clock-names = "iface_clk";
 		clock-names = "km_clk_src";
 		clocks = <&rpmcc RPM_SMD_HWKM_CLK>;
 	};
@@ -1066,7 +1063,6 @@
 		iommus = <&apps_smmu 0x0086 0x0011>,
 			 <&apps_smmu 0x0096 0x0011>;
 		qcom,iommu-dma = "atomic";
-		status = "disabled";
 		qcom_cedev_ns_cb {
 			compatible = "qcom,qcedev,context-bank";
 			label = "ns_context";
@@ -1120,7 +1116,6 @@
 		iommus = <&apps_smmu 0x0084 0x0011>,
 			<&apps_smmu 0x0094 0x0011>;
 		qcom,iommu-dma = "atomic";
-		status = "disabled";
 	};
 
 	qcom,mpm2-sleep-counter@4403000 {
@@ -1176,6 +1171,10 @@
 		rpm-channel-type = <15>; /* SMD_APPS_RPM */
 	};
 
+	system_pm_rpm {
+		compatible = "qcom,system-pm-rpm";
+	};
+
 	qcom,chd_silver {
 		compatible = "qcom,core-hang-detect";
 		label = "silver";
@@ -1196,7 +1195,7 @@
 
 	pil_scm_pas {
 		compatible = "qcom,pil-tz-scm-pas";
-		interconnects = <&clk_virt MASTER_CRYPTO_CORE0 &bimc SLAVE_EBI_CH0>;
+		interconnects = <&system_noc MASTER_CRYPTO_CORE0 &bimc SLAVE_EBI_CH0>;
 	};
 
 	qcom,lpass@ab00000 {
@@ -2209,11 +2208,11 @@
 			<0x1c0a000 0x26000>;
 		reg-names = "core", "chnls", "obsrvr", "intr", "cnfg";
 		interrupt-names = "periph_irq";
-		interrupts = <GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH>;
+		interrupts-extended = <&wakegic 86 IRQ_TYPE_LEVEL_HIGH>;
 		qcom,ee = <0>;
 		qcom,channel = <0>;
-		#address-cells = <1>;
-		#size-cells = <1>;
+		#address-cells = <2>;
+		#size-cells = <0>;
 		interrupt-controller;
 		#interrupt-cells = <4>;
 		cell-index = <0>;
@@ -2358,8 +2357,8 @@
 	};
 
 	cpu_cpu_ddr_bw: qcom,cpu-cpu-ddr-bw {
-		compatible = "qcom,devfreq-icc";
-		governor = "bw_hwmon";
+		compatible = "qcom,devfreq-icc-ddr";
+		governor = "performance";
 		interconnects = <&bimc MASTER_AMPSS_M0 &bimc SLAVE_EBI_CH0>;
 		qcom,active-only;
 		operating-points-v2 = <&ddr_bw_opp_table>;
@@ -2377,15 +2376,17 @@
 	};
 
 	cpu0_cpu_ddr_latfloor: qcom,cpu0-cpu-ddr-latfloor {
-		compatible = "qcom,devfreq-icc-l3";
-		governor = "mem_latency";
+		compatible = "qcom,devfreq-icc-ddr";
+		governor = "performance";
+		interconnects = <&bimc MASTER_AMPSS_M0 &bimc SLAVE_EBI_CH0>;
 		qcom,active-only;
 		operating-points-v2 = <&ddr_bw_opp_table>;
 	};
 
 	cpu0_cpu_ddr_lat: qcom,cpu0-cpu-ddr-lat {
-		compatible = "qcom,devfreq-icc-l3";
-		governor = "mem_latency";
+		compatible = "qcom,devfreq-icc-ddr";
+		governor = "performance";
+		interconnects = <&bimc MASTER_AMPSS_M0 &bimc SLAVE_EBI_CH0>;
 		qcom,active-only;
 		operating-points-v2 = <&ddr_bw_opp_table>;
 	};
@@ -2442,15 +2443,17 @@
 	};
 
 	cpu4_cpu_ddr_lat: qcom,cpu4-cpu-ddr-lat {
-		compatible = "qcom,devfreq-icc-l3";
-		governor = "mem_latency";
+		compatible = "qcom,devfreq-icc-ddr";
+		governor = "performance";
+		interconnects = <&bimc MASTER_AMPSS_M0 &bimc SLAVE_EBI_CH0>;
 		qcom,active-only;
 		operating-points-v2 = <&ddr_bw_opp_table>;
 	};
 
 	cpu4_cpu_ddr_latfloor: qcom,cpu4-cpu-ddr-latfloor {
-		compatible = "qcom,devfreq-icc-l3";
-		governor = "mem_latency";
+		compatible = "qcom,devfreq-icc-ddr";
+		governor = "performance";
+		interconnects = <&bimc MASTER_AMPSS_M0 &bimc SLAVE_EBI_CH0>;
 		qcom,active-only;
 		operating-points-v2 = <&ddr_bw_opp_table>;
 	};
diff --git a/qcom/direwolf-qupv3.dtsi b/qcom/direwolf-qupv3.dtsi
index 6c987f2d..09bcf573 100755
--- a/qcom/direwolf-qupv3.dtsi
+++ b/qcom/direwolf-qupv3.dtsi
@@ -43,6 +43,32 @@
 		status = "ok";
 	};
 
+	gpi_dma0: qcom,gpi-dma@900000 {
+		compatible = "qcom,gpi-dma";
+		#dma-cells = <5>;
+		reg = <0x900000 0x60000>;
+		reg-names = "gpi-top";
+		interrupts = <GIC_SPI 244 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 245 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 248 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 249 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 250 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 251 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 252 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 253 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 254 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 255 IRQ_TYPE_LEVEL_HIGH>;
+		qcom,max-num-gpii = <12>;
+		qcom,gpii-mask = <0xfff>;
+		qcom,ev-factor = <2>;
+		iommus = <&apps_smmu 0x576 0x0>;
+		qcom,gpi-ee-offset = <0x10000>;
+		qcom,iommu-dma-addr-pool = <0x40000000 0x10000000>;
+		status = "disabled";
+	};
+
 	/* QUPv3_1  wrapper  instance */
 	qupv3_1: qcom,qupv3_1_geni_se@ac0000 {
 		compatible = "qcom,qupv3-geni-se";
@@ -58,6 +84,32 @@
 		status = "ok";
 	};
 
+	gpi_dma1: qcom,gpi-dma@a00000 {
+		compatible = "qcom,gpi-dma";
+		#dma-cells = <5>;
+		reg = <0xa00000 0x60000>;
+		reg-names = "gpi-top";
+		interrupts = <GIC_SPI 279 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 280 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 281 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 282 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 283 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 284 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 293 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 294 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 295 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 296 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 297 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 298 IRQ_TYPE_LEVEL_HIGH>;
+		qcom,max-num-gpii = <12>;
+		qcom,gpii-mask = <0xfff>;
+		qcom,ev-factor = <2>;
+		iommus = <&apps_smmu 0x0096 0x0>;
+		qcom,gpi-ee-offset = <0x10000>;
+		qcom,iommu-dma-addr-pool = <0x40000000 0x10000000>;
+		status = "ok";
+	};
+
 	/* QUPv3_2  wrapper  instance */
 	qupv3_2: qcom,qupv3_2_geni_se@8c0000 {
 		compatible = "qcom,qupv3-geni-se";
@@ -73,6 +125,32 @@
 		status = "ok";
 	};
 
+	gpi_dma2: qcom,gpi-dma@800000 {
+		compatible = "qcom,gpi-dma";
+		#dma-cells = <5>;
+		reg = <0x800000 0x60000>;
+		reg-names = "gpi-top";
+		interrupts = <GIC_SPI 588 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 589 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 590 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 591 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 592 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 593 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 594 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 595 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 596 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 597 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 598 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 599 IRQ_TYPE_LEVEL_HIGH>;
+		qcom,max-num-gpii = <12>;
+		qcom,gpii-mask = <0xfff>;
+		qcom,ev-factor = <2>;
+		iommus = <&apps_smmu 0x00b6 0x0>;
+		qcom,gpi-ee-offset = <0x10000>;
+		qcom,iommu-dma-addr-pool = <0x40000000 0x10000000>;
+		status = "disabled";
+	};
+
 	/* Debug UART Instance */
 	qupv3_se17_2uart: qcom,qup_uart@884000 {
 		compatible = "qcom,msm-geni-console";
@@ -975,9 +1053,12 @@
 			<&gcc GCC_QUPV3_WRAP_1_M_AHB_CLK>,
 			<&gcc GCC_QUPV3_WRAP_1_S_AHB_CLK>;
 		pinctrl-names = "default", "active", "sleep";
-		pinctrl-0 = <&qupv3_se13_2uart_default &qupv3_se13_2uart_disable>;
-		pinctrl-1 = <&qupv3_se13_2uart_active &qupv3_se13_2uart_disable>;
-		pinctrl-2 = <&qupv3_se13_2uart_sleep &qupv3_se13_2uart_disable>;
+		pinctrl-0 = <&qupv3_se13_2uart_default>;
+		pinctrl-1 = <&qupv3_se13_2uart_active>;
+		pinctrl-2 = <&qupv3_se13_2uart_sleep>;
+		dmas = <&gpi_dma1 0 5 2 64 0>,
+			<&gpi_dma1 1 5 2 64 0>;
+		dma-names = "tx", "rx";
 		qcom,wrapper-core = <&qupv3_1>;
 		status = "disabled";
 	};
diff --git a/qcom/direwolf-usb.dtsi b/qcom/direwolf-usb.dtsi
index 8a46922a..ff4b0d8c 100755
--- a/qcom/direwolf-usb.dtsi
+++ b/qcom/direwolf-usb.dtsi
@@ -268,20 +268,21 @@
 			USB43DP_QSERDES_RXB_Q_PI_INTRINSIC_BIAS_RATE32	0x3F 0
 			USB3_PCS_RCVR_DTCT_DLY_P1U2_L	0xE7 0
 			USB3_PCS_RCVR_DTCT_DLY_P1U2_H	0x03 0
-			USB3_PCS_LOCK_DETECT_CONFIG1	0xD0 0
-			USB3_PCS_LOCK_DETECT_CONFIG2	0x07 0
+			USB3_PCS_LOCK_DETECT_CONFIG1	0xC4 0
+			USB3_PCS_LOCK_DETECT_CONFIG2	0x89 0
 			USB3_PCS_LOCK_DETECT_CONFIG3	0x20 0
 			USB3_PCS_LOCK_DETECT_CONFIG6	0x13 0
 			USB3_PCS_REFGEN_REQ_CONFIG1	0x21 0
-			USB3_PCS_RX_SIGDET_LVL	0xAA 0
+			USB3_PCS_RX_SIGDET_LVL	0x33 0
 			USB3_PCS_RX_CONFIG	0x0A 0
-			USB3_PCS_ALIGN_DETECT_CONFIG1	0x88 0
-			USB3_PCS_ALIGN_DETECT_CONFIG2	0x13 0
+			USB3_PCS_ALIGN_DETECT_CONFIG1	0xD4 0
+			USB3_PCS_ALIGN_DETECT_CONFIG2	0x30 0
 			USB3_PCS_PCS_TX_RX_CONFIG	0x0C 0
 			USB3_PCS_EQ_CONFIG1	0x4B 0
 			USB3_PCS_EQ_CONFIG5	0x10 0
 			USB3_PCS_USB3_LFPS_DET_HIGH_COUNT_VAL	0xF8 0
 			USB3_PCS_USB3_RXEQTRAINING_DFE_TIME_S2	0x07 0
+			USB3_PCS_USB3_POWER_STATE_CONFIG1	0x68 0
 			0xffffffff 0xffffffff 0x00>;
 	};
 
@@ -556,20 +557,21 @@
 			USB43DP_QSERDES_RXB_Q_PI_INTRINSIC_BIAS_RATE32	0x3F 0
 			USB3_PCS_RCVR_DTCT_DLY_P1U2_L	0xE7 0
 			USB3_PCS_RCVR_DTCT_DLY_P1U2_H	0x03 0
-			USB3_PCS_LOCK_DETECT_CONFIG1	0xD0 0
-			USB3_PCS_LOCK_DETECT_CONFIG2	0x07 0
+			USB3_PCS_LOCK_DETECT_CONFIG1	0xC4 0
+			USB3_PCS_LOCK_DETECT_CONFIG2	0x89 0
 			USB3_PCS_LOCK_DETECT_CONFIG3	0x20 0
 			USB3_PCS_LOCK_DETECT_CONFIG6	0x13 0
 			USB3_PCS_REFGEN_REQ_CONFIG1	0x21 0
-			USB3_PCS_RX_SIGDET_LVL	0xAA 0
+			USB3_PCS_RX_SIGDET_LVL	0x33 0
 			USB3_PCS_RX_CONFIG	0x0A 0
-			USB3_PCS_ALIGN_DETECT_CONFIG1	0x88 0
-			USB3_PCS_ALIGN_DETECT_CONFIG2	0x13 0
+			USB3_PCS_ALIGN_DETECT_CONFIG1	0xD4 0
+			USB3_PCS_ALIGN_DETECT_CONFIG2	0x30 0
 			USB3_PCS_PCS_TX_RX_CONFIG	0x0C 0
 			USB3_PCS_EQ_CONFIG1	0x4B 0
 			USB3_PCS_EQ_CONFIG5	0x10 0
 			USB3_PCS_USB3_LFPS_DET_HIGH_COUNT_VAL	0xF8 0
 			USB3_PCS_USB3_RXEQTRAINING_DFE_TIME_S2	0x07 0
+			USB3_PCS_USB3_POWER_STATE_CONFIG1	0x68 0
 			0xffffffff 0xffffffff 0x00>;
 	};
 
diff --git a/qcom/direwolf-vm-la-mt-overlay.dts b/qcom/direwolf-vm-la-mt-overlay.dts
new file mode 100755
index 00000000..961ca639
--- /dev/null
+++ b/qcom/direwolf-vm-la-mt-overlay.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+/plugin/;
+
+#include "direwolf-vm.dtsi"
+#include "direwolf-vm-la-mt.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Direwolf Multi LA Virtual Machine";
+	compatible = "qcom,direwolf", "qcom,quinvm";
+	qcom,board-id = <0 0x2000001>;
+};
diff --git a/qcom/direwolf-vm-la-mt.dtsi b/qcom/direwolf-vm-la-mt.dtsi
index e4455682..6e159e05 100755
--- a/qcom/direwolf-vm-la-mt.dtsi
+++ b/qcom/direwolf-vm-la-mt.dtsi
@@ -9,17 +9,22 @@
 #include "direwolf-cnss.dtsi"
 
 / {
-	rename_blk: rename_blk {
-		compatible = "qcom,blkdev-rename";
-		actual-dev = "vda", "vdb", "vdc",
-				"vdd", "vde", "vdf",
-				"vdg", "vdh", "vdi";
-		rename-dev = "system", "userdata", "vendor",
-				"persist", "modem", "bluetooth",
-				"misc", "vbmeta";
-		rename-dev-ab = "super", "userdata", "metadata",
-				"persist", "modem_a", "bluetooth_a",
-				"misc", "vbmeta_a", "vbmeta_b";
+	rename_devices: rename_devices {
+		compatible = "qcom,rename-devices";
+		rename_blk: rename_blk {
+			device-type = "block";
+			actual-dev = "vda", "vdb", "vdc",
+					"vdd", "vde", "vdf",
+					"vdg", "vdh", "vdi",
+					"vdj", "vdk";
+			rename-dev = "system", "userdata", "vendor",
+					"persist", "modem", "bluetooth",
+					"misc", "vbmeta", "boot", "dtbo";
+			rename-dev-ab = "super", "userdata", "metadata",
+					"persist", "modem_a", "bluetooth_a",
+					"misc", "vbmeta_a", "vbmeta_b",
+					"boot", "dtbo";
+		};
 	};
 };
 
diff --git a/qcom/direwolf-vm-la-overlay.dts b/qcom/direwolf-vm-la-overlay.dts
new file mode 100755
index 00000000..43a525d1
--- /dev/null
+++ b/qcom/direwolf-vm-la-overlay.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+/plugin/;
+
+#include "direwolf-vm.dtsi"
+#include "direwolf-vm-la.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Direwolf Single LA Virtual Machine";
+	compatible = "qcom,direwolf", "qcom,quinvm";
+	qcom,board-id = <0 0x1000001>;
+};
diff --git a/qcom/direwolf-vm-la.dtsi b/qcom/direwolf-vm-la.dtsi
index 67163137..465dea2f 100755
--- a/qcom/direwolf-vm-la.dtsi
+++ b/qcom/direwolf-vm-la.dtsi
@@ -14,17 +14,22 @@
 };
 
 / {
-	rename_blk: rename_blk {
-		compatible = "qcom,blkdev-rename";
-		actual-dev = "vda", "vdb", "vdc",
-				"vdd", "vde", "vdf",
-				"vdg", "vdh", "vdi";
-		rename-dev = "system", "userdata", "vendor",
-				"persist", "modem", "bluetooth",
-				"misc", "vbmeta";
-		rename-dev-ab = "super", "userdata", "metadata",
-				"persist", "modem_a", "bluetooth_a",
-				"misc", "vbmeta_a", "vbmeta_b";
+	rename_devices: rename_devices {
+		compatible = "qcom,rename-devices";
+		rename_blk: rename_blk {
+			device-type = "block";
+			actual-dev = "vda", "vdb", "vdc",
+					"vdd", "vde", "vdf",
+					"vdg", "vdh", "vdi",
+					"vdj", "vdk";
+			rename-dev = "system", "userdata", "vendor",
+					"persist", "modem", "bluetooth",
+					"misc", "vbmeta", "boot", "dtbo";
+			rename-dev-ab = "super", "userdata", "metadata",
+					"persist", "modem_a", "bluetooth_a",
+					"misc", "vbmeta_a", "vbmeta_b",
+					"boot", "dtbo";
+		};
 	};
 };
 
@@ -90,3 +95,5 @@
 &qcom_rng_ee3 {
 	status = "okay";
 };
+
+#include "direwolf-vm-gnss.dtsi"
diff --git a/qcom/direwolf-vm-la1-mt-overlay.dts b/qcom/direwolf-vm-la1-mt-overlay.dts
new file mode 100755
index 00000000..787b3253
--- /dev/null
+++ b/qcom/direwolf-vm-la1-mt-overlay.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+/plugin/;
+
+#include "direwolf-vm.dtsi"
+#include "direwolf-vm-la1-mt.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Direwolf Multi LA1 Virtual Machine";
+	compatible = "qcom,direwolf", "qcom,quinvm";
+	qcom,board-id = <0 0x3000001>;
+};
+
diff --git a/qcom/direwolf-vm-la1-mt.dtsi b/qcom/direwolf-vm-la1-mt.dtsi
index f44742ae..74f29e19 100755
--- a/qcom/direwolf-vm-la1-mt.dtsi
+++ b/qcom/direwolf-vm-la1-mt.dtsi
@@ -10,24 +10,28 @@
 };
 
 / {
-	rename_blk: rename_blk {
-		compatible = "qcom,blkdev-rename";
-		actual-dev = "vda", "vdb", "vdc",
-				"vdd", "vde", "vdf",
-				"vdg", "vdh", "vdi";
-		rename-dev = "system", "userdata", "vendor",
-				"persist", "modem", "bluetooth",
-				"misc", "vbmeta";
-	};
-};
+	rename_devices: rename_devices {
+		compatible = "qcom,rename-devices";
+
+		rename_blk: rename_blk {
+			device-type = "block";
+			actual-dev = "vda", "vdb", "vdc",
+					"vdd", "vde", "vdf",
+					"vdg", "vdh", "vdi",
+					"vdj", "vdk";
+			rename-dev = "system", "userdata", "vendor",
+					"persist", "modem", "bluetooth",
+					"misc", "vbmeta", "boot", "dtbo";
+			rename-dev-ab = "super", "userdata", "metadata",
+					"persist", "modem_a", "bluetooth_a",
+					"misc", "vbmeta_a", "vbmeta_b",
+					"boot", "dtbo";
+		};
 
-&firmware {
-	android {
-		boot_devices = "vdevs/1c220000.virtio_blk,vdevs/1c120000.virtio_blk,vdevs/1c210000.virtio_blk,vdevs/1c190000.virtio_blk,vdevs/1c160000.virtio_blk";
-		fstab {
-			vendor {
-				dev="/dev/block/platform/vdevs/1c210000.virtio_blk/vendor";
-			};
+		rename_net: rename_net {
+			device-type = "net";
+			actual-dev = "eth0";
+			rename-dev = "eth1";
 		};
 	};
 };
@@ -35,3 +39,19 @@
 &qcom_rng_ee4 {
 	status = "okay";
 };
+
+&usb1 {
+	status = "okay";
+};
+
+&usb2_phy1 {
+	status = "okay";
+};
+
+&pcie0 {
+	status = "okay";
+};
+
+&pcie2a_msi_snps {
+	status = "okay";
+};
diff --git a/qcom/direwolf-vm-lv-mt-overlay.dts b/qcom/direwolf-vm-lv-mt-overlay.dts
new file mode 100755
index 00000000..c2d243df
--- /dev/null
+++ b/qcom/direwolf-vm-lv-mt-overlay.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+/plugin/;
+
+#include "direwolf-vm.dtsi"
+#include "direwolf-vm-lv-mt.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Direwolf Multi LV Virtual Machine";
+	compatible = "qcom,direwolf", "qcom,quinvm";
+	qcom,board-id = <0 0x2000002>;
+};
diff --git a/qcom/direwolf-vm-lv-overlay.dts b/qcom/direwolf-vm-lv-overlay.dts
new file mode 100755
index 00000000..db42d935
--- /dev/null
+++ b/qcom/direwolf-vm-lv-overlay.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+/plugin/;
+
+#include "direwolf-vm.dtsi"
+#include "direwolf-vm-lv.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Direwolf Single LV Virtual Machine";
+	compatible = "qcom,direwolf", "qcom,quinvm";
+	qcom,board-id = <0 0x1000002>;
+};
diff --git a/qcom/lemans-rumi.dtsi b/qcom/lemans-rumi.dtsi
index 6d877b1b..35a248a0 100755
--- a/qcom/lemans-rumi.dtsi
+++ b/qcom/lemans-rumi.dtsi
@@ -40,3 +40,19 @@
 		maximum-speed = "high-speed";
 	};
 };
+
+&tsens0 {
+		status = "disabled";
+};
+
+&tsens1 {
+		status = "disabled";
+};
+
+&tsens2 {
+		status = "disabled";
+};
+
+&tsens3 {
+		status = "disabled";
+};
diff --git a/qcom/lemans-stub-regulator.dtsi b/qcom/lemans-stub-regulator.dtsi
index 29198a01..47042642 100755
--- a/qcom/lemans-stub-regulator.dtsi
+++ b/qcom/lemans-stub-regulator.dtsi
@@ -3,9 +3,9 @@
 / {
 	VDD_CX_LEVEL:
 	S1A_LEVEL:
-	pm8225_a_s1_level: regulator-pm8225_a-s1-level {
+		pm8775_a_s1_level: regulator-pm8775_a-s1-level {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_a_s1_level";
+		regulator-name = "pm8775_a_s1_level";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt =
 			<RPMH_REGULATOR_LEVEL_RETENTION>;
@@ -15,9 +15,9 @@
 
 	VDD_CX_LEVEL_AO:
 	S1A_LEVEL_AO:
-	pm8225_a_s1_level_ao: regulator-pm8225_a-s1-level-ao {
+		pm8775_a_s1_level_ao: regulator-pm8775_a-s1-level-ao {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_a_s1_level_ao";
+		regulator-name = "pm8775_a_s1_level_ao";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt =
 			<RPMH_REGULATOR_LEVEL_RETENTION>;
@@ -26,10 +26,10 @@
 	};
 
 	VDD_GFX_LEVEL:
-	S5A_LEVEL:
-	pm8225_a_s5_level: regulator-pm8225_a-s5-level {
+	S6A_LEVEL:
+		pm8775_a_s6_level: regulator-pm8775_a-s6-level {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_a_s5_level";
+		regulator-name = "pm8775_a_s6_level";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt =
 			<RPMH_REGULATOR_LEVEL_RETENTION>;
@@ -37,11 +37,11 @@
 			<RPMH_REGULATOR_LEVEL_MAX>;
 	};
 
-	VDD_MXA_LEVEL:
-	S1C_LEVEL:
-	pm8225_c_s1_level: regulator-pm8225_c-s1-level {
+	VDD_LPI_MX_LEVEL:
+	L1A_LEVEL:
+	pm8775_a_l1_level: regulator-pm8775_a-l1-level {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_c_s1_level";
+		regulator-name = "pm8775_a_l1_level";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt =
 			<RPMH_REGULATOR_LEVEL_RETENTION>;
@@ -49,11 +49,11 @@
 			<RPMH_REGULATOR_LEVEL_MAX>;
 	};
 
-	VDD_MXA_LEVEL_AO:
-	S1C_LEVEL_AO:
-	pm8225_c_s1_level_ao: regulator-pm8225_c-s1-level-ao {
+	VDD_LPI_CX_LEVEL:
+	L2A_LEVEL:
+	pm8775_a_l2_level: regulator-pm8775_a-l2-level {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_c_s1_level_ao";
+		regulator-name = "pm8775_a_l2_level";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt =
 			<RPMH_REGULATOR_LEVEL_RETENTION>;
@@ -61,12 +61,11 @@
 			<RPMH_REGULATOR_LEVEL_MAX>;
 	};
 
-	VDD_MMCX_LEVEL:
-	VDD_MM_LEVEL:
-	S3C_LEVEL:
-	pm8225_c_s3_level: regulator-pm8225_c-s3-level {
+	VDD_MXA_LEVEL:
+	S1C_LEVEL:
+	pm8775_c_s1_level: regulator-pm8775_c-s1-level {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_c_s3_level";
+		regulator-name = "pm8775_c_s1_level";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt =
 			<RPMH_REGULATOR_LEVEL_RETENTION>;
@@ -74,12 +73,11 @@
 			<RPMH_REGULATOR_LEVEL_MAX>;
 	};
 
-	VDD_MMCX_LEVEL_AO:
-	VDD_MM_LEVEL_AO:
-	S3C_LEVEL_AO:
-	pm8225_c_s3_level_ao: regulator-pm8225_c-s3-level-ao {
+	VDD_MXA_LEVEL_AO:
+	S1C_LEVEL_AO:
+	pm8775_c_s1_level_ao: regulator-pm8775_c-s1-level-ao {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_c_s3_level_ao";
+		regulator-name = "pm8775_c_s1_level_ao";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt =
 			<RPMH_REGULATOR_LEVEL_RETENTION>;
@@ -87,11 +85,14 @@
 			<RPMH_REGULATOR_LEVEL_MAX>;
 	};
 
-	VDD_NSP_0_LEVEL:
-	S6C_LEVEL:
-	pm8225_c_s6_level: regulator-pm8225_c-s6-level {
+	VDD_MMCX_LEVEL:
+	VDD_MM_MXC_VOTER_LEVEL:
+	VDD_GX_MXC_VOTER_LEVEL:
+	VDD_MM_LEVEL:
+	S3C_LEVEL:
+	pm8775_c_s3_level: regulator-pm8775_c-s3-level {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_c_s6_level";
+		regulator-name = "pm8775_c_s3_level";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt =
 			<RPMH_REGULATOR_LEVEL_RETENTION>;
@@ -99,11 +100,12 @@
 			<RPMH_REGULATOR_LEVEL_MAX>;
 	};
 
-	VDD_NSP_0_LEVEL_AO:
-	S6C_LEVEL_AO:
-	pm8225_c_s6_level_ao: regulator-pm8225_c-s6-level-ao {
+	VDD_MMCX_LEVEL_AO:
+	VDD_MM_LEVEL_AO:
+	S3C_LEVEL_AO:
+	pm8775_c_s3_level_ao: regulator-pm8775_c-s3-level-ao {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_c_s6_level_ao";
+		regulator-name = "pm8775_c_s3_level_ao";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt =
 			<RPMH_REGULATOR_LEVEL_RETENTION>;
@@ -111,11 +113,11 @@
 			<RPMH_REGULATOR_LEVEL_MAX>;
 	};
 
-	VDD_LPI_MX_LEVEL:
-	L1C_LEVEL:
-	pm8225_c_l1_level: regulator-pm8225_c-l1-level {
+	VDD_NSP_0_LEVEL:
+	S6C_LEVEL:
+	pm8775_c_s6_level: regulator-pm8775_c-s6-level {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_c_l1_level";
+		regulator-name = "pm8775_c_s6_level";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt =
 			<RPMH_REGULATOR_LEVEL_RETENTION>;
@@ -123,11 +125,11 @@
 			<RPMH_REGULATOR_LEVEL_MAX>;
 	};
 
-	VDD_LPI_CX_LEVEL:
-	L2C_LEVEL:
-	pm8225_c_l2_level: regulator-pm8225_c-l2-level {
+	VDD_NSP_0_LEVEL_AO:
+	S6C_LEVEL_AO:
+	pm8775_c_s6_level_ao: regulator-pm8775_c-s6-level-ao {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_c_l2_level";
+		regulator-name = "pm8775_c_s6_level_ao";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt =
 			<RPMH_REGULATOR_LEVEL_RETENTION>;
@@ -137,9 +139,9 @@
 
 	VDD_MXC_LEVEL:
 	S5E_LEVEL:
-	pm8225_e_s5_level: regulator-pm8225_e-s5-level {
+	pm8775_e_s5_level: regulator-pm8775_e-s5-level {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_e_s5_level";
+		regulator-name = "pm8775_e_s5_level";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt =
 			<RPMH_REGULATOR_LEVEL_RETENTION>;
@@ -149,9 +151,9 @@
 
 	VDD_MXC_LEVEL_AO:
 	S5E_LEVEL_AO:
-	pm8225_e_s5_level_ao: regulator-pm8225_e-s5-level-ao {
+	pm8775_e_s5_level_ao: regulator-pm8775_e-s5-level-ao {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_e_s5_level_ao";
+		regulator-name = "pm8775_e_s5_level_ao";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt =
 			<RPMH_REGULATOR_LEVEL_RETENTION>;
@@ -161,9 +163,9 @@
 
 	VDD_EBI_LEVEL:
 	S8E_LEVEL:
-	pm8225_e_s8_level: regulator-pm8225_e-s8-level {
+	pm8775_e_s8_level: regulator-pm8775_e-s8-level {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_e_s8_level";
+		regulator-name = "pm8775_e_s8_level";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt =
 			<RPMH_REGULATOR_LEVEL_RETENTION>;
@@ -173,9 +175,9 @@
 
 	VDD_NSP_1_LEVEL:
 	S1G_LEVEL:
-	pm8225_g_s1_level: regulator-pm8225_g-s1-level {
+	pm8775_g_s1_level: regulator-pm8775_g-s1-level {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_g_s1_level";
+		regulator-name = "pm8775_g_s1_level";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt =
 			<RPMH_REGULATOR_LEVEL_RETENTION>;
@@ -185,9 +187,9 @@
 
 	VDD_NSP_1_LEVEL_AO:
 	S1G_LEVEL_AO:
-	pm8225_g_s1_level_ao: regulator-pm8225_g-s1-level-ao {
+	pm8775_g_s1_level_ao: regulator-pm8775_g-s1-level-ao {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_g_s1_level_ao";
+		regulator-name = "pm8775_g_s1_level_ao";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt =
 			<RPMH_REGULATOR_LEVEL_RETENTION>;
@@ -195,201 +197,237 @@
 			<RPMH_REGULATOR_LEVEL_MAX>;
 	};
 
-	S4A:
-	pm8225_a_s4: regulator-pm8225_a-s4 {
+	S4A: UFS_VCCQ2:
+	pm8775_a_s4: regulator-pm8775_a-s4 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_a_s4";
+		regulator-name = "pm8775_a_s4";
 		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <645000>;
+		regulator-min-microvolt = <1620000>;
 		regulator-max-microvolt = <2000000>;
 	};
 
-	L1A:
-	pm8225_a_l1: regulator-pm8225_a-l1 {
+	S5A:
+	pm8775_a_s5: regulator-pm8775_a-s5 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_a_l1";
+		regulator-name = "pm8775_a_s5";
 		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1140000>;
-		regulator-max-microvolt = <1260000>;
+		regulator-min-microvolt = <1850000>;
+		regulator-max-microvolt = <2100000>;
 	};
 
-	L3A:
-	pm8225_a_l3: regulator-pm8225_a-l3 {
+	S9A:
+	pm8775_a_s9: regulator-pm8775_a-s9 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_a_l3";
+		regulator-name = "pm8775_a_s9";
 		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1100000>;
-		regulator-max-microvolt = <1300000>;
+		regulator-min-microvolt = <582000>;
+		regulator-max-microvolt = <1156000>;
 	};
 
 	L4A:
-	pm8225_a_l4: regulator-pm8225_a-l4 {
+	pm8775_a_l4: regulator-pm8775_a-l4 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_a_l4";
+		regulator-name = "pm8775_a_l4";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <788000>;
 		regulator-max-microvolt = <1050000>;
 	};
 
 	L5A:
-	pm8225_a_l5: regulator-pm8225_a-l5 {
+	pm8775_a_l5: regulator-pm8775_a-l5 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_a_l5";
+		regulator-name = "pm8775_a_l5";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <870000>;
 		regulator-max-microvolt = <950000>;
 	};
 
 	L6A:
-	pm8225_a_l6: regulator-pm8225_a-l6 {
+	pm8775_a_l6: regulator-pm8775_a-l6 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_a_l6";
+		regulator-name = "pm8775_a_l6";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <870000>;
 		regulator-max-microvolt = <970000>;
 	};
 
 	L7A:
-	pm8225_a_l7: regulator-pm8225_a-l7 {
+	pm8775_a_l7: regulator-pm8775_a-l7 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_a_l7";
+		regulator-name = "pm8775_a_l7";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <720000>;
 		regulator-max-microvolt = <950000>;
 	};
 
 	L8A: UFS0_VCC:
-	pm8225_a_l8: regulator-pm8225_a-l8 {
+	pm8775_a_l8: regulator-pm8775_a-l8 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_a_l8";
+		regulator-name = "pm8775_a_l8";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <2400000>;
 		regulator-max-microvolt = <3300000>;
 	};
 
 	L9A:
-	pm8225_a_l9: regulator-pm8225_a-l9 {
+	pm8775_a_l9: regulator-pm8775_a-l9 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_a_l9";
+		regulator-name = "pm8775_a_l9";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <2970000>;
 		regulator-max-microvolt = <3544000>;
 	};
 
+	S5C:
+	pm8775_c_s5: regulator-pm8775_c-s5 {
+		compatible = "qcom,stub-regulator";
+		regulator-name = "pm8775_c_s5";
+		qcom,hpm-min-load = <10000>;
+		regulator-min-microvolt = <300000>;
+		regulator-max-microvolt = <2744000>;
+	};
+
+	L1C:
+	pm8775_c_l1: regulator-pm8775_c-l1 {
+		compatible = "qcom,stub-regulator";
+		regulator-name = "pm8775_c_l1";
+		qcom,hpm-min-load = <10000>;
+		regulator-min-microvolt = <1140000>;
+		regulator-max-microvolt = <1260000>;
+	};
+
+	L2C:
+	pm8775_c_l2: regulator-pm8775_c-l2 {
+		compatible = "qcom,stub-regulator";
+		regulator-name = "pm8775_c_l2";
+		qcom,hpm-min-load = <10000>;
+		regulator-min-microvolt = <900000>;
+		regulator-max-microvolt = <1100000>;
+	};
+
+	L3C:
+	pm8775_c_l3: regulator-pm8775_c-l3 {
+		compatible = "qcom,stub-regulator";
+		regulator-name = "pm8775_c_l3";
+		qcom,hpm-min-load = <10000>;
+		regulator-min-microvolt = <1100000>;
+		regulator-max-microvolt = <1300000>;
+	};
+
 	L4C: UFS0_VCCQ:
-	pm8225_c_l4: regulator-pm8225_c-l4 {
+	pm8775_c_l4: regulator-pm8775_c-l4 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_c_l4";
+		regulator-name = "pm8775_c_l4";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <1100000>;
 		regulator-max-microvolt = <1300000>;
 	};
 
 	L5C: UFS1_VCCQ:
-	pm8225_c_l5: regulator-pm8225_c-l5 {
+	pm8775_c_l5: regulator-pm8775_c-l5 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_c_l5";
+		regulator-name = "pm8775_c_l5";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <1100000>;
 		regulator-max-microvolt = <1300000>;
 	};
 
 	L6C:
-	pm8225_c_l6: regulator-pm8225_c-l6 {
+	pm8775_c_l6: regulator-pm8775_c-l6 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_c_l6";
+		regulator-name = "pm8775_c_l6";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <1620000>;
 		regulator-max-microvolt = <1980000>;
 	};
 
 	L7C:
-	pm8225_c_l7: regulator-pm8225_c-l7 {
+	pm8775_c_l7: regulator-pm8775_c-l7 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_c_l7";
+		regulator-name = "pm8775_c_l7";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <1620000>;
 		regulator-max-microvolt = <2000000>;
 	};
 
 	L8C: UFS1_VCC:
-	pm8225_c_l8: regulator-pm8225_c-l8 {
+	pm8775_c_l8: regulator-pm8775_c-l8 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_c_l8";
+		regulator-name = "pm8775_c_l8";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <2400000>;
 		regulator-max-microvolt = <3300000>;
 	};
 
 	L9C:
-	pm8225_c_l9: regulator-pm8225_c-l9 {
+	pm8775_c_l9: regulator-pm8775_c-l9 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_c_l9";
+		regulator-name = "pm8775_c_l9";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <1650000>;
 		regulator-max-microvolt = <2700000>;
 	};
 
+	S4E:
+	pm8775_e_s4: regulator-pm8775_e-s4 {
+		compatible = "qcom,stub-regulator";
+		regulator-name = "pm8775_e_s4";
+		qcom,hpm-min-load = <10000>;
+		regulator-min-microvolt = <970000>;
+		regulator-max-microvolt = <1450000>;
+	};
+
 	S7E:
-	pm8225_e_s7: regulator-pm8225_e-s7 {
+	pm8775_e_s7: regulator-pm8775_e-s7 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_e_s7";
+		regulator-name = "pm8775_e_s7";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <1010000>;
 		regulator-max-microvolt = <1170000>;
 	};
 
 	S9E:
-	pm8225_e_s9: regulator-pm8225_e-s9 {
+	pm8775_e_s9: regulator-pm8775_e-s9 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_e_s9";
+		regulator-name = "pm8775_e_s9";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <300000>;
 		regulator-max-microvolt = <570000>;
 	};
 
 	L6E:
-	pm8225_e_l6: regulator-pm8225_e-l6 {
+	pm8775_e_l6: regulator-pm8775_e-l6 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_e_l6";
+		regulator-name = "pm8775_e_l6";
 		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1700000>;
-		regulator-max-microvolt = <1950000>;
+		regulator-min-microvolt = <1280000>;
+		regulator-max-microvolt = <1450000>;
 	};
 
 	L8E:
-	pm8225_e_l8: regulator-pm8225_e-l8 {
+	pm8775_e_l8: regulator-pm8775_e-l8 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_e_l8";
+		regulator-name = "pm8775_e_l8";
 		qcom,hpm-min-load = <10000>;
 		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <2070000>;
-	};
-
-	L9E: SD_CARD_LVL:
-	pm8225_e_l9: regulator-pm8225_e-l9 {
-		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_e_l9";
-		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <2700000>;
-		regulator-max-microvolt = <3544000>;
+		regulator-max-microvolt = <1950000>;
 	};
 
-	L4G:
-	pm8225_g_l4: regulator-pm8225_g-l4 {
+	S8G:
+	pm8775_g_s8: regulator-pm8775_g-s8 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_g_l4";
+		regulator-name = "pm8775_g_s8";
 		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <1280000>;
-		regulator-max-microvolt = <1450000>;
+		regulator-min-microvolt = <300000>;
+		regulator-max-microvolt = <2744000>;
 	};
 
-	L5G:
-	pm8225_g_l5: regulator-pm8225_g-l5 {
+	S9G:
+	pm8775_g_s9: regulator-pm8775_g-s9 {
 		compatible = "qcom,stub-regulator";
-		regulator-name = "pm8225_g_l5";
+		regulator-name = "pm8775_g_s9";
 		qcom,hpm-min-load = <10000>;
-		regulator-min-microvolt = <900000>;
-		regulator-max-microvolt = <1050000>;
+		regulator-min-microvolt = <300000>;
+		regulator-max-microvolt = <2744000>;
 	};
 };
diff --git a/qcom/lemans-thermal.dtsi b/qcom/lemans-thermal.dtsi
new file mode 100755
index 00000000..aced14f3
--- /dev/null
+++ b/qcom/lemans-thermal.dtsi
@@ -0,0 +1,1734 @@
+#include <dt-bindings/thermal/thermal_qti.h>
+
+&soc {
+	tsens0:tsens@c222000 {
+		compatible = "qcom,tsens26xx";
+		reg = <0x0C222000 0x8>,
+		      <0x0C263000 0x1ff>;
+		reg-names = "tsens_srot_physical",
+			"tsens_tm_physical";
+		interrupts-extended = <GIC_SPI 538 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 540 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "tsens-upper-lower", "tsens-critical";
+		#thermal-sensor-cells = <1>;
+	};
+
+	tsens1:tsens@c223000 {
+		compatible = "qcom,tsens26xx";
+		reg = <0x0C223000 0x8>,
+			<0x0C265000 0x1ff>;
+		reg-names = "tsens_srot_physical",
+			"tsens_tm_physical";
+		interrupts-extended = <GIC_SPI 539 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 541 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "tsens-upper-lower", "tsens-critical";
+		#thermal-sensor-cells = <1>;
+	};
+
+	tsens2:tsens@c224000 {
+		compatible = "qcom,tsens26xx";
+		reg = <0x0C224000 0x8>,
+			<0x0C251000 0x1ff>;
+		reg-names = "tsens_srot_physical",
+			"tsens_tm_physical";
+		interrupts-extended = <GIC_SPI 604 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 641 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "tsens-upper-lower", "tsens-critical";
+		#thermal-sensor-cells = <1>;
+	};
+
+	tsens3:tsens@c225000 {
+		compatible = "qcom,tsens26xx";
+		reg = <0x0C223000 0x8>,
+			<0x0C252000 0x1ff>;
+		reg-names = "tsens_srot_physical",
+			"tsens_tm_physical";
+		interrupts-extended = <GIC_SPI 605 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 642 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "tsens-upper-lower", "tsens-critical";
+		#thermal-sensor-cells = <1>;
+	};
+};
+
+&thermal_zones {
+	cpu-0-0-0-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens0 1>;
+		trips {
+			cpu000_config: cpu000-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			cpu000_config1: cpu000-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpu-0-1-0-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens0 2>;
+		trips {
+			cpu010_config: cpu010-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			cpu010_config1: cpu010-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpu-0-2-0-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens0 3>;
+		trips {
+			cpu020_config: cpu020-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			cpu020_config1: cpu020-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpu-0-3-0-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens0 4>;
+		trips {
+			cpu030_config: cpu030-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			cpu030_config1: cpu030-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	gpuss-0-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens0 5>;
+		trips {
+			gpuss0_config: gpuss0-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			gpuss0_config1: gpuss0-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	gpuss-1-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens0 6>;
+		trips {
+			gpuss1_config: gpuss1-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			gpuss1_config1: gpuss1-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	gpuss-2-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens0 7>;
+		trips {
+			gpuss2_config: gpuss2-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			gpuss2_config1: gpuss2-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpu-0-0-1-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens1 1>;
+		trips {
+			cpu001_config: cpu001-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			cpu001_config1: cpu001-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpu-0-1-1-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens1 2>;
+		trips {
+			cpu011_config: cpu011-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			cpu011_config1: cpu011-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpu-0-2-1-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens1 3>;
+		trips {
+			cpu021_config: cpu021-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			cpu021_config1: cpu021-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpu-0-3-1-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens1 4>;
+		trips {
+			cpu031_config: cpu031-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			cpu031_config1: cpu031-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	gpuss-3-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens1 5>;
+		trips {
+			gpuss3_config: gpuss3-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			gpuss3_config1: gpuss3-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	gpuss-4-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens1 6>;
+		trips {
+			gpuss4_config: gpuss4-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			gpuss4_config1: gpuss4-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	gpuss-5-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens1 7>;
+		trips {
+			gpuss5_config: gpuss5-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			gpuss5_config1: gpuss5-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpu-1-0-0-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens2 1>;
+		trips {
+			cpu100_config: cpu100-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			cpu100_config1: cpu100-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpu-1-1-0-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens2 2>;
+		trips {
+			cpu110_config: cpu110-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			cpu110_config1: cpu110-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpu-1-2-0-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens2 3>;
+		trips {
+			cpu120_config: cpu120-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			cpu120_config1: cpu120-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpu-1-3-0-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens2 4>;
+		trips {
+			cpu130_config: cpu130-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			cpu130_config1: cpu130-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	nsp-0-0-0-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens2 5>;
+		trips {
+			nsp000_config: nsp000-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			nsp000_config1: nsp000-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	nsp-0-1-0-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens2 6>;
+		trips {
+			nsp010_config: nsp010-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			nsp010_config1: nsp010-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	nsp-0-2-0-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens2 7>;
+		trips {
+			nsp020_config: nsp020-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			nsp020_config1: nsp020-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	nsp-1-0-0-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens2 8>;
+		trips {
+			nsp100_config: nsp100-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			nsp100_config1: nsp100-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	nsp-1-1-0-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens2 9>;
+		trips {
+			nsp110_config: nsp110-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			nsp110_config1: nsp110-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	nsp-1-2-0-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens2 10>;
+		trips {
+			nsp120_config: nsp120-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			nsp120_config1: nsp120-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpu-1-0-1-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens3 1>;
+		trips {
+			cpu101_config: cpu101-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			cpu101_config1: cpu101-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpu-1-1-1-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens3 2>;
+		trips {
+			cpu111_config: cpu111-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			cpu111_config1: cpu111-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpu-1-2-1-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens3 3>;
+		trips {
+			cpu121_config: cpu121-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			cpu121_config1: cpu121-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpu-1-3-1-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens3 4>;
+		trips {
+			cpu131_config: cpu131-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			cpu131_config1: cpu131-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	nsp-0-0-1-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens3 5>;
+		trips {
+			nsp001_config: nsp001-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			nsp001_config1: nsp001-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	nsp-0-1-1-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens3 6>;
+		trips {
+			nsp011_config: nsp011-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			nsp011_config1: nsp011-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	nsp-0-2-1-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens3 7>;
+		trips {
+			nsp021_config: nsp021-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			nsp021_config1: nsp021-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	nsp-1-0-1-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens3 8>;
+		trips {
+			nsp101_config: nsp101-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			nsp101_config1: nsp101-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	nsp-1-1-1-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens3 9>;
+		trips {
+			nsp111_config: nsp111-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			nsp111_config1: nsp111-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	nsp-1-2-1-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens3 10>;
+		trips {
+			nsp121_config: nsp121-config {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			nsp121_config1: nsp121-config1 {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	aoss-0-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens0 0>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpu-0-0-0-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens0 1>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpu-0-1-0-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens0 2>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpu-0-2-0-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens0 3>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpu-0-3-0-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens0 4>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	gpuss-0-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens0 5>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	gpuss-1-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens0 6>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	gpuss-2-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens0 7>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	audio-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens0 8>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	camss-0-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens0 9>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	pcie-0-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens0 10>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpuss-0-0-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens0 11>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	aoss-1-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens1 0>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpu-0-0-1-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens1 1>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpu-0-1-1-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens1 2>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpu-0-2-1-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens1 3>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpu-0-3-1-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens1 4>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	gpuss-3-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens1 5>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	gpuss-4-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens1 6>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	gpuss-5-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens1 7>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	video-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens1 8>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	camss-1-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens1 9>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	pcie-1-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens1 10>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpuss-0-1-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens1 11>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	aoss-2-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens2 0>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpu-1-0-0-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens2 1>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpu-1-1-0-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens2 2>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpu-1-2-0-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens2 3>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpu-1-3-0-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens2 4>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	nsp-0-0-0-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens2 5>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	nsp-0-1-0-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens2 6>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	nsp-0-2-0-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens2 7>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	nsp-1-0-0-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens2 8>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	nsp-1-1-0-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens2 9>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	nsp-1-2-0-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens2 10>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	ddrss-0-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens2 11>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpuss-1-0-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens2 12>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	aoss-3-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens3 0>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpuss-1-0-1-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens3 1>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpuss-1-1-1-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens3 2>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpuss-1-2-1-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens3 3>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpuss-1-3-1-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens3 4>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	nsp-0-0-1-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens3 5>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	nsp-0-1-1-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens3 6>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	nsp-0-2-1-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens3 7>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	nsp-1-0-1-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens3 8>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	nsp-1-1-1-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens3 9>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	nsp-1-2-1-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens3 10>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	ddrss-1-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens3 11>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+
+	cpuss-1-1-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&tsens3 12>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+	};
+};
+
diff --git a/qcom/lemans.dtsi b/qcom/lemans.dtsi
index 2a783eb9..46100347 100755
--- a/qcom/lemans.dtsi
+++ b/qcom/lemans.dtsi
@@ -739,6 +739,9 @@
 		compatible = "lahaina-epss-l3-cpu";
 		#interconnect-cells = <1>;
 	};
+
+	thermal_zones: thermal-zones {
+	};
 };
 
 #include "direwolf-gdsc.dtsi"
@@ -915,3 +918,4 @@
 };
 
 #include "lemans-stub-regulator.dtsi"
+#include "lemans-thermal.dtsi"
diff --git a/qcom/monaco-standalone-idp-v1.dtsi b/qcom/monaco-standalone-idp-v1.dtsi
index c96fa469..5d6461f0 100755
--- a/qcom/monaco-standalone-idp-v1.dtsi
+++ b/qcom/monaco-standalone-idp-v1.dtsi
@@ -58,8 +58,8 @@
 &pm5100_qbg {
 	status = "ok";
 	qcom,battery-data = <&monaco_batterydata>;
-	nvmem-cell-names = "qbg_debug_mask_low", "qbg_debug_mask_high";
-	nvmem-cells = <&qbg_debug_mask_low>, <&qbg_debug_mask_high>;
+	nvmem-cell-names = "qbg_debug_mask_low", "qbg_debug_mask_high", "skip_esr_state";
+	nvmem-cells = <&qbg_debug_mask_low>, <&qbg_debug_mask_high>, <&skip_esr_state>;
 	#io-channel-cells = <1>;
 	io-channels = <&pm5100_adc PM5100_ADC5_GEN3_BATT_THM_100K_PU>,
 		      <&pm5100_adc PM5100_ADC5_GEN3_BAT_ID_100K_PU>,
diff --git a/qcom/monaco-wdp.dtsi b/qcom/monaco-wdp.dtsi
index 407b466e..72619b71 100755
--- a/qcom/monaco-wdp.dtsi
+++ b/qcom/monaco-wdp.dtsi
@@ -1,9 +1,48 @@
+&pm5100_adc {
+	pm5100_pa_therm_0 {
+		reg = <PM5100_ADC5_GEN3_AMUX5_THM_100K_PU>;
+	};
+
+	pm5100_quiet_therm {
+		status = "disabled";
+	};
+
+	pm5100_cam_therm {
+		reg = <PM5100_ADC5_GEN3_AMUX4_THM_100K_PU>;
+		label = "pm5100_cam_therm";
+		qcom,ratiometric;
+		qcom,hw-settle-time = <200>;
+		qcom,pre-scaling = <1 1>;
+		qcom,adc-tm-type = <1>;
+	};
+};
+
 &thermal_zones {
-	pa-therm0-step {
-		status = "ok";
+	pa-therm0-usr {
+		thermal-sensors = <&pm5100_adc PM5100_ADC5_GEN3_AMUX5_THM_100K_PU>;
+	};
+
+	quiet-therm-usr {
+		status = "disabled";
 	};
 
-	quiet-therm-step {
+	cam-therm-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&pm5100_adc PM5100_ADC5_GEN3_AMUX4_THM_100K_PU>;
+		wake-capable-sensor;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+		};
+	};
+
+	pa-therm0-step {
+		thermal-sensors = <&pm5100_adc PM5100_ADC5_GEN3_AMUX5_THM_100K_PU>;
 		status = "ok";
 	};
 };
diff --git a/qcom/msm-audio-lpass.dtsi b/qcom/msm-audio-lpass.dtsi
index 4c76a385..767f60eb 100755
--- a/qcom/msm-audio-lpass.dtsi
+++ b/qcom/msm-audio-lpass.dtsi
@@ -858,7 +858,7 @@
 
 	tdm_hsif0_tx: qcom,msm-dai-tdm-hsif0-tx {
 		compatible = "qcom,msm-dai-tdm";
-		qcom,msm-cpudai-tdm-group-id = <37231>;
+		qcom,msm-cpudai-tdm-group-id = <37233>;
 		qcom,msm-cpudai-tdm-group-num-ports = <1>;
 		qcom,msm-cpudai-tdm-group-port-id = <36977>;
 		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
diff --git a/qcom/pm5100.dtsi b/qcom/pm5100.dtsi
index 76a3e157..94646945 100755
--- a/qcom/pm5100.dtsi
+++ b/qcom/pm5100.dtsi
@@ -308,6 +308,16 @@
 			reg = <0x7600>;
 		};
 
+		pm5100_sdam_22: sdam@8500 {
+			compatible = "qcom,spmi-sdam";
+			reg = <0x8500>;
+
+			/* GPS demod state */
+			skip_esr_state: demod@46 {
+				reg = <0x46 0x1>;
+			};
+		};
+
 		pm5100_sdam_23: sdam@8600 {
 			compatible = "qcom,spmi-sdam";
 			reg = <0x8600>;
diff --git a/qcom/prairie-iot-idp.dtsi b/qcom/prairie-iot-idp.dtsi
index 4e27be72..52fa8019 100755
--- a/qcom/prairie-iot-idp.dtsi
+++ b/qcom/prairie-iot-idp.dtsi
@@ -4,6 +4,7 @@
 #include "display/sm6150-sde-display.dtsi"
 #include <dt-bindings/clock/qcom,gcc-sm6150.h>
 #include <dt-bindings/iio/qti_power_supply_iio.h>
+#include "camera/sm6150-camera-sensor-idp.dtsi"
 
 &qupv3_se3_i2c {
 	#address-cells = <1>;
@@ -24,6 +25,43 @@
 			power-source = <0>;
 		};
 	};
+
+	cam_sensor_dvdd {
+		cam_sensor_dvdd_default: cam_sensor_dvdd_default {
+			pins = "gpio3";
+			function = "normal";
+			output-low;
+			power-source = <0>;
+		};
+	};
+
+	cam_sensor_1_vana {
+		cam_sensor_1_vana_default: cam_sensor_1_vana_default {
+			pins = "gpio8";
+			function = "normal";
+			output-low;
+			power-source = <0>;
+		};
+	};
+
+	cam_sensor_0_vana {
+		cam_sensor_0_vana_default: cam_sensor_0_vana_default {
+			pins = "gpio9";
+			function = "normal";
+			output-low;
+			power-source = <0>;
+		};
+	};
+
+	cam_sensor_1_2_vana {
+		cam_sensor_1_2_vana_default: cam_sensor_1_2_vana_default {
+			pins = "gpio4";
+			function = "normal";
+			output-low;
+			power-source = <0>;
+		};
+	};
+
 };
 
 &soc {
@@ -140,6 +178,10 @@
 	status = "ok";
 };
 
+&flash_led {
+	status = "ok";
+};
+
 &pm6150l_wled {
 	qcom,string-cfg= <3>;
 	qcom,leds-per-string = <7>;
@@ -272,6 +314,7 @@
 };
 
 &pm6150_qg {
+	qcom,battery-data = <&mtp_batterydata>;
 	qcom,qg-iterm-ma = <100>;
 	qcom,hold-soc-while-full;
 	qcom,linearize-soc;
@@ -288,6 +331,8 @@
 		<&pm6150_vadc ADC5_AMUX_THM4_100K_PU>,
 		<&pm6150_vadc ADC5_SBUx>,
 		<&pm6150_vadc ADC5_VPH_PWR>,
+		<&pm6150_qg PSY_IIO_CHARGE_FULL>,
+		<&pm6150_qg PSY_IIO_CHARGE_FULL_DESIGN>,
 		<&pm6150_qg PSY_IIO_RESISTANCE_ID>,
 		<&pm6150_qg PSY_IIO_VOLTAGE_NOW>,
 		<&pm6150_qg PSY_IIO_TEMP>,
@@ -309,6 +354,8 @@
 		"conn_temp",
 		"sbux_res",
 		"vph_voltage",
+		"charge_full",
+		"charge_full_design",
 		"resistance_id",
 		"voltage_now",
 		"temp",
@@ -323,7 +370,7 @@
 		"charge_counter",
 		"cycle_count",
 		"time_to_full_now";
-	qcom,batteryless-platform;
+	qcom,battery-data = <&mtp_batterydata>;
 	qcom,auto-recharge-soc = <98>;
 	qcom,step-charging-enable;
 	qcom,sw-jeita-enable;
diff --git a/qcom/qcs610-iot.dtsi b/qcom/qcs610-iot.dtsi
index f1a35027..c17d6474 100755
--- a/qcom/qcs610-iot.dtsi
+++ b/qcom/qcs610-iot.dtsi
@@ -43,25 +43,40 @@
 		};
 	};
 
-	cam_sensor_dvdd_en: cam_sensor_dvdd_en {
-		pins = "gpio3";
-		function = "normal";
-		power-source = <0>;
-		output-low;
+	cam_sensor_dvdd {
+		cam_sensor_dvdd_default: cam_sensor_dvdd_default {
+			pins = "gpio3";
+			function = "normal";
+			output-low;
+			power-source = <0>;
+		};
+	};
+
+	cam_sensor_1_vana {
+		cam_sensor_1_vana_default: cam_sensor_1_vana_default {
+			pins = "gpio8";
+			function = "normal";
+			output-low;
+			power-source = <0>;
+		};
 	};
 
-	cam_sensor_0_vana: cam_sensor_0_vana {
-		pins = "gpio9";
-		function = "normal";
-		power-source = <0>;
-		output-low;
+	cam_sensor_0_vana {
+		cam_sensor_0_vana_default: cam_sensor_0_vana_default {
+			pins = "gpio9";
+			function = "normal";
+			output-low;
+			power-source = <0>;
+		};
 	};
 
-	cam_sensor_1_2_vana: cam_sensor_1_2_vana {
-		pins = "gpio4";
-		function = "normal";
-		power-source = <0>;
-		output-low;
+	cam_sensor_1_2_vana {
+		cam_sensor_1_2_vana_default: cam_sensor_1_2_vana_default {
+			pins = "gpio4";
+			function = "normal";
+			output-low;
+			power-source = <0>;
+		};
 	};
 };
 
diff --git a/qcom/qcs610-opk-overlay.dts b/qcom/qcs610-opk-overlay.dts
new file mode 100755
index 00000000..e2a895dc
--- /dev/null
+++ b/qcom/qcs610-opk-overlay.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+/plugin/;
+
+#include "qcs610-opk.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Openkit Overlay";
+	compatible = "qcom,qcs610-opk", "qcom,qcs610", "qcom,opk";
+	qcom,msm-id = <401 0x0>;
+	qcom,board-id = <32 3>;
+};
diff --git a/qcom/qcs610-opk.dts b/qcom/qcs610-opk.dts
new file mode 100755
index 00000000..2ea22f5e
--- /dev/null
+++ b/qcom/qcs610-opk.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+
+#include "qcs610.dtsi"
+#include "qcs610-opk.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. QCS610 Openkit";
+	compatible = "qcom,qcs610-opk", "qcom,qcs610", "qcom,opk";
+	qcom,msm-id = <401 0x0>;
+	qcom,board-id = <32 3>;
+};
diff --git a/qcom/qcs610-opk.dtsi b/qcom/qcs610-opk.dtsi
new file mode 100755
index 00000000..be81bdd9
--- /dev/null
+++ b/qcom/qcs610-opk.dtsi
@@ -0,0 +1,456 @@
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/iio/qcom,spmi-vadc.h>
+#include <dt-bindings/input/input.h>
+
+#include <dt-bindings/clock/qcom,rpmh.h>
+#include <dt-bindings/clock/qcom,gcc-sm6150.h>
+#include <dt-bindings/clock/qcom,camcc-sm6150.h>
+#include <dt-bindings/clock/qcom,dispcc-sm6150.h>
+#include <dt-bindings/clock/qcom,gpucc-sm6150.h>
+#include <dt-bindings/iio/qti_power_supply_iio.h>
+
+#include "camera/qcs610-camera-sensor-opk.dtsi"
+
+#include "sm6150-audio.dtsi"
+#include "sm6150-ext-codec-audio-overlay.dtsi"
+#include "sm6150-external-codec.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. QCS610 IOT";
+	compatible = "qcom,qcs610-iot", "qcom,qcs610", "qcom,iot";
+	qcom,board-id = <32 0>;
+};
+
+&pm6150l_gpios {
+	key_vol_up {
+		key_vol_up_default: key_vol_up_default {
+			pins = "gpio2";
+			function = "normal";
+			input-enable;
+			bias-pull-up;
+			power-source = <0>;
+		};
+	};
+
+	irled {
+		irled_pwm: irled_pwm_default {
+			pins = "gpio6";
+			function = "func1";
+			qcom,drive-strength = <2>;
+			power-source = <0>;
+			bias-disable;
+			output-low;
+		};
+	};
+
+	cam_sensor_dvdd {
+		cam_sensor_dvdd_default: cam_sensor_dvdd_default {
+			pins = "gpio3";
+			function = "normal";
+			output-low;
+			power-source = <0>;
+		};
+	};
+
+	cam_sensor_1_vana {
+		cam_sensor_1_vana_default: cam_sensor_1_vana_default {
+			pins = "gpio8";
+			function = "normal";
+			output-low;
+			power-source = <0>;
+		};
+	};
+
+	cam_sensor_0_vana {
+		cam_sensor_0_vana_default: cam_sensor_0_vana_default {
+			pins = "gpio9";
+			function = "normal";
+			output-low;
+			power-source = <0>;
+		};
+	};
+
+	cam_sensor_1_2_vana {
+		cam_sensor_1_2_vana_default: cam_sensor_1_2_vana_default {
+			pins = "gpio4";
+			function = "normal";
+			output-low;
+			power-source = <0>;
+		};
+	};
+};
+
+&soc {
+	gpio_keys {
+		compatible = "gpio-keys";
+		label = "gpio-keys";
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&key_vol_up_default>;
+
+		vol_up {
+			label = "volume_up";
+			gpios = <&pm6150l_gpios 2 GPIO_ACTIVE_LOW>;
+			linux,input-type = <1>;
+			linux,code = <KEY_VOLUMEUP>;
+			linux,can-disable;
+			debounce-interval = <15>;
+			gpio-key,wakeup;
+		};
+	};
+
+	mtp_batterydata: qcom,battery-data {
+		qcom,batt-id-range-pct = <15>;
+		#include "qg-batterydata-alium-3600mah.dtsi"
+		#include "qg-batterydata-mlp356477-2800mah.dtsi"
+	};
+};
+
+&tlmm {
+	usb_typea_host {
+		usb_typea_host_en: usb_typea_host_en {
+			mux {
+				pins = "gpio54";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio54";
+				drive-strength = <2>;
+				bias-disable;
+				output-high;
+			};
+		};
+	};
+};
+
+
+&flash_led {
+	status = "ok";
+};
+
+&pm6150l_wled {
+	qcom,string-cfg= <1>;
+	qcom,leds-per-string = <7>;
+	status = "ok";
+	qcom,cabc-sel = <0>;
+	qcom,fs-current-limit = <20000>;
+	default-brightness = <2000>;
+};
+
+&pm6150l_lcdb {
+	status = "ok";
+};
+
+&pm6150l_pwm_1 {
+	status = "disabled";
+};
+
+&usb1 {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&usb_typea_host_en>;
+};
+
+&pm6150_qg {
+	qcom,battery-data = <&mtp_batterydata>;
+	qcom,qg-iterm-ma = <100>;
+	qcom,hold-soc-while-full;
+	qcom,linearize-soc;
+	qcom,cl-feedback-on;
+};
+
+&pm6150_pdphy {
+	#io-channel-cells = <1>;
+	io-channels = <&pm6150_charger PSY_IIO_PD_ACTIVE>,
+		      <&pm6150_charger PSY_IIO_TYPEC_CC_ORIENTATION>,
+		      <&pm6150_charger PSY_IIO_CONNECTOR_TYPE>,
+		      <&pm6150_charger PSY_IIO_TYPEC_POWER_ROLE>,
+		      <&pm6150_charger PSY_IIO_PD_USB_SUSPEND_SUPPORTED>,
+		      <&pm6150_charger PSY_IIO_TYPEC_SRC_RP>,
+		      <&pm6150_charger PSY_IIO_PD_IN_HARD_RESET>,
+		      <&pm6150_charger PSY_IIO_PD_CURRENT_MAX>,
+		      <&pm6150_charger PSY_IIO_PR_SWAP>,
+		      <&pm6150_charger PSY_IIO_PD_VOLTAGE_MIN>,
+		      <&pm6150_charger PSY_IIO_PD_VOLTAGE_MAX>,
+		      <&pm6150_charger PSY_IIO_USB_REAL_TYPE>,
+		      <&pm6150_charger PSY_IIO_TYPEC_MODE>,
+		      <&pm6150_charger PSY_IIO_PE_START>;
+	io-channel-names = "pd_active",
+			   "typec_cc_orientation",
+			   "connector_type",
+			   "typec_power_role",
+			   "pd_usb_suspend_supported",
+			   "typec_src_rp",
+			   "pd_in_hard_reset",
+			   "pr_current_max",
+			   "pr_swap",
+			   "pd_voltage_min",
+			   "pd_voltage_max",
+			   "real_type",
+			   "typec_mode",
+			   "pe_start";
+};
+
+&pm6150_charger {
+	depends-on-supply = <&pm6150_vadc>;
+	#io-channel-cells = <1>;
+	io-channels = <&pm6150_vadc ADC5_USB_IN_V_16>,
+		      <&pm6150_vadc ADC5_USB_IN_I>,
+		      <&pm6150_vadc ADC5_CHG_TEMP>,
+		      <&pm6150_vadc ADC5_DIE_TEMP>,
+		      <&pm6150_vadc ADC5_AMUX_THM4_100K_PU>,
+		      <&pm6150_vadc ADC5_SBUx>,
+		      <&pm6150_vadc ADC5_VPH_PWR>,
+		      <&pm6150_qg PSY_IIO_CHARGE_FULL>,
+		      <&pm6150_qg PSY_IIO_CHARGE_FULL_DESIGN>,
+		      <&pm6150_qg PSY_IIO_RESISTANCE_ID>,
+		      <&pm6150_qg PSY_IIO_VOLTAGE_NOW>,
+		      <&pm6150_qg PSY_IIO_TEMP>,
+		      <&pm6150_qg PSY_IIO_CAPACITY>,
+		      <&pm6150_qg PSY_IIO_VOLTAGE_OCV>,
+		      <&pm6150_qg PSY_IIO_VOLTAGE_AVG>,
+		      <&pm6150_qg PSY_IIO_DEBUG_BATTERY>,
+		      <&pm6150_qg PSY_IIO_REAL_CAPACITY>,
+		      <&pm6150_qg PSY_IIO_CC_SOC>,
+		      <&pm6150_qg PSY_IIO_CURRENT_NOW>,
+		      <&pm6150_qg PSY_IIO_VOLTAGE_MAX>,
+		      <&pm6150_qg PSY_IIO_CHARGE_COUNTER>,
+		      <&pm6150_qg PSY_IIO_CYCLE_COUNT>,
+		      <&pm6150_qg PSY_IIO_TIME_TO_FULL_NOW>;
+	io-channel-names = "usb_in_voltage",
+			   "usb_in_current",
+			   "chg_temp",
+			   "die_temp",
+			   "conn_temp",
+			   "sbux_res",
+			   "vph_voltage",
+			   "charge_full",
+			   "charge_full_design",
+			   "resistance_id",
+			   "voltage_now",
+			   "temp",
+			   "capacity",
+			   "voltage_ocv",
+			   "voltage_avg",
+			   "debug_battery",
+			   "real_capacity",
+			   "cc_soc",
+			   "current_now",
+			   "voltage_max",
+			   "charge_counter",
+			   "cycle_count",
+			   "time_to_full_now";
+	qcom,battery-data = <&mtp_batterydata>;
+	qcom,auto-recharge-soc = <98>;
+	qcom,step-charging-enable;
+	qcom,sw-jeita-enable;
+	qcom,fcc-stepping-enable;
+	qcom,suspend-input-on-debug-batt;
+	qcom,sec-charger-config = <0>;
+	qcom,thermal-mitigation = <4200000 3500000 3000000
+			2500000 2000000 1500000 1000000 500000>;
+	dpdm-supply = <&qusb_phy0>;
+	qcom,charger-temp-max = <800>;
+	qcom,smb-temp-max = <800>;
+};
+
+&usb0 {
+	qcom,interconnect-values-nom = /* NOMINAL Votes */
+						<1000000 2500000>,
+						<0 2400>,
+						<0 40000>;
+	qcom,interconnect-values-svs = /* SVS Votes */
+						<240000 700000>,
+						<0 2400>,
+						<0 40000>;
+	extcon = <&pm6150_pdphy>, <&pm6150_charger>, <&eud>;
+
+	#io-channel-cells = <1>;
+	io-channels= <&pm6150_charger PSY_IIO_USB_REAL_TYPE>;
+	io-channel-names = "chg_type";
+};
+
+&qupv3_se0_2uart {
+	status = "ok";
+};
+
+&qupv3_se7_4uart {
+	status = "ok";
+};
+
+&pil_camera_mem {
+	reg = <0x0 0x8f800000 0x0 0x500000>;
+};
+
+&pil_modem_mem {
+	reg = <0x0 0x8fd00000 0x0 0x3100000>;
+};
+
+&msm_gpu {
+	/delete-node/qcom,gpu-mempools;
+};
+
+&sdhc_1 {
+	vdd-supply = <&pm6150l_l11>;
+	qcom,vdd-voltage-level = <2950000 2950000>;
+	qcom,vdd-current-level = <0 570000>;
+
+	vdd-io-supply = <&pm6150_l12>;
+	qcom,vdd-io-always-on;
+	qcom,vdd-io-lpm-sup;
+	qcom,vdd-io-voltage-level = <1800000 1800000>;
+	qcom,vdd-io-current-level = <0 325000>;
+
+	pinctrl-names = "default", "sleep";
+	pinctrl-0 = <&sdc1_on>;
+	pinctrl-1 = <&sdc1_off>;
+
+	status = "ok";
+};
+
+&sdhc_2 {
+	vdd-supply = <&pm6150l_l9>;
+	qcom,vdd-voltage-level = <2950000 2950000>;
+	qcom,vdd-current-level = <0 800000>;
+
+	vdd-io-supply = <&pm6150l_l6>;
+	qcom,vdd-io-voltage-level = <1800000 3100000>;
+	qcom,vdd-io-current-level = <0 22000>;
+
+	pinctrl-names = "default", "sleep";
+	pinctrl-0 = <&sdc2_on>;
+	pinctrl-1 = <&sdc2_off>;
+
+	cd-gpios = <&tlmm 99 GPIO_ACTIVE_LOW>;
+
+	status = "ok";
+};
+
+&L16A {
+	regulator-max-microvolt = <3304000>;
+};
+
+&L19A {
+	regulator-max-microvolt = <3304000>;
+};
+
+&L4C {
+	regulator-max-microvolt = <2912000>;
+};
+
+&L5C {
+	regulator-max-microvolt = <2912000>;
+};
+
+&L13A {
+	regulator-always-on;
+};
+
+&L7C {
+	regulator-always-on;
+};
+
+&L10A {
+	regulator-always-on;
+};
+
+&L14A {
+	regulator-always-on;
+};
+
+&sde_dp {
+	status="disabled";
+};
+
+&mdss_mdp {
+	connectors = <&smmu_sde_unsec &sde_dsi &sde_rscc>;
+};
+
+&dsi_ili9881c_720p_video {
+	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
+	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";
+	qcom,mdss-dsi-bl-min-level = <1>;
+	qcom,mdss-dsi-bl-max-level = <4095>;
+	qcom,platform-reset-gpio = <&tlmm 91 0>;
+};
+
+&ts_int_active {
+	mux {
+		pins = "gpio87";
+	};
+
+	config {
+		pins = "gpio87";
+	};
+};
+
+&ts_int_suspend {
+	mux {
+		pins = "gpio87";
+	};
+
+	config {
+		pins = "gpio87";
+	};
+};
+
+&ts_reset_active {
+	mux {
+		pins = "gpio75";
+	};
+
+	config {
+		pins = "gpio75";
+	};
+};
+
+&ts_reset_suspend {
+	mux {
+		pins = "gpio75";
+	};
+
+	config {
+		pins = "gpio75";
+	};
+};
+
+&ts_release {
+	mux {
+		pins = "gpio87", "gpio75";
+	};
+
+	config {
+		pins = "gpio87", "gpio75";
+	};
+};
+
+&qupv3_se1_i2c {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	status = "ok";
+	qcom,i2c-touch-active = "focaltech,fts_ts";
+
+	focaltech@38 {
+		compatible = "focaltech,fts_ts";
+		reg = <0x38>;
+		interrupt-parent = <&tlmm>;
+		interrupts = <87 0x2008>;
+		focaltech,reset-gpio = <&tlmm 75 0x0>;
+		focaltech,irq-gpio = <&tlmm 87 0x2008>;
+		focaltech,max-touch-number = <5>;
+		focaltech,display-coords = <0 0 720 1280>;
+
+		vdd-supply = <&L7C>;
+		vcc_i2c-supply = <&L13A>;
+
+		pinctrl-names = "pmx_ts_active", "pmx_ts_suspend",
+			"pmx_ts_release";
+		pinctrl-0 = <&ts_int_active &ts_reset_active>;
+		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
+		pinctrl-2 = <&ts_release>;
+
+		panel = <&dsi_ili9881c_720p_video>;
+	};
+};
diff --git a/qcom/quin-vm-common.dtsi b/qcom/quin-vm-common.dtsi
index 7f57fef5..3b8d1747 100755
--- a/qcom/quin-vm-common.dtsi
+++ b/qcom/quin-vm-common.dtsi
@@ -61,7 +61,7 @@
 	firmware: firmware {
 		android {
 			compatible = "android,firmware";
-			boot_devices = "vdevs/1c140000.virtio_blk,vdevs/1c0b0000.virtio_blk,vdevs/1c0f0000.virtio_blk,vdevs/1c160000.virtio_blk,vdevs/1c130000.virtio_blk,vdevs/1c0e0000.virtio_blk";
+			boot_devices = "vdevs/1c140000.virtio_blk,vdevs/1c0b0000.virtio_blk,vdevs/1c0f0000.virtio_blk,vdevs/1c160000.virtio_blk,vdevs/1c130000.virtio_blk,vdevs/1c0e0000.virtio_blk,vdevs/1c160000.virtio_blk,vdevs/1c130000.virtio_blk,vdevs/1c170000.virtio_blk,vdevs/1c180000.virtio_blk";
 
 			vbmeta {
 				compatible = "android,vbmeta";
diff --git a/qcom/sa410m-pmic.dtsi b/qcom/sa410m-pmic.dtsi
index cc2e8bc4..c0fd324c 100755
--- a/qcom/sa410m-pmic.dtsi
+++ b/qcom/sa410m-pmic.dtsi
@@ -71,8 +71,6 @@
 	};
 
 	/delete-node/ vbat_sns;
-	/delete-node/ usb_in_v_div_16;
-	/delete-node/ chg_temp;
 	/delete-node/ bat_therm;
 	/delete-node/ bat_therm_30k;
 	/delete-node/ bat_therm_400k;
@@ -134,7 +132,6 @@
 		};
 
 		/delete-node/ pm2250_qg;
-		/delete-node/ pm2250_charger;
 	};
 
 	qcom,pm2250@1 {
diff --git a/qcom/sa410m-qrd.dts b/qcom/sa410m-qrd.dts
index d9b8c850..43ef0860 100755
--- a/qcom/sa410m-qrd.dts
+++ b/qcom/sa410m-qrd.dts
@@ -42,7 +42,7 @@
 	pinctrl-0 = <&sdc2_on>;
 	pinctrl-1 = <&sdc2_off>;
 
-	cd-gpios = <&tlmm 88 GPIO_ACTIVE_LOW>;
+	cd-gpios = <&tlmm 88 GPIO_ACTIVE_HIGH>;
 
 	status = "ok";
 };
diff --git a/qcom/sa410m.dtsi b/qcom/sa410m.dtsi
index 36da5e00..081d536c 100755
--- a/qcom/sa410m.dtsi
+++ b/qcom/sa410m.dtsi
@@ -1425,6 +1425,7 @@
 		qcom,ee = <0>;
 		qcom,use-ipa-tethering-bridge;
 		qcom,modem-cfg-emb-pipe-flt;
+		qcom,use-xbl-boot;
 		qcom,ipa-wdi2;
 		qcom,ipa-wdi2_over_gsi;
 		qcom,ipa-endp-delay-wa;
@@ -1574,6 +1575,22 @@
 	status = "ok";
 };
 
+&pm2250_charger {
+	interrupts-extended = <&tlmm 89 0>;
+	interrupt-names = "usb_id_irq";
+	qcom,usb-id-gpio = <&tlmm 89 0>;
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&usb_id_interrupt>;
+
+	qcom,batteryless-platform;
+	qcom,auto-recharge-soc = <98>;
+	io-channels = <&pm2250_vadc ADC5_USB_IN_V_16>,
+			<&pm2250_vadc ADC5_CHG_TEMP>;
+	io-channel-names = "usb_in_voltage",
+			"chg_temp";
+};
+
 #include "msm-arm-smmu-scuba.dtsi"
 
 /delete-node/ &kgsl_iommu_test_device;
diff --git a/qcom/sa515m-ccard-eth-ep.dts b/qcom/sa515m-ccard-eth-ep.dts
new file mode 100755
index 00000000..c8afd203
--- /dev/null
+++ b/qcom/sa515m-ccard-eth-ep.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "sa515m.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA515M CCARD ETH";
+	compatible = "qcom,sa515m-ccard",
+			"qcom,sa515m", "qcom,ccard";
+	qcom,board-id = <25 5>, <25 0x105>;
+};
diff --git a/qcom/sa515m-ccard-pcie-ep.dts b/qcom/sa515m-ccard-pcie-ep.dts
new file mode 100755
index 00000000..08aa1f1d
--- /dev/null
+++ b/qcom/sa515m-ccard-pcie-ep.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "sa515m.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA515M CCARD PCIE-EP";
+	compatible = "qcom,sa515m-ccard",
+			"qcom,sa515m", "qcom,ccard";
+	qcom,board-id = <25 1>, <25 0x101>;
+};
diff --git a/qcom/sa515m-ccard-usb-ep.dts b/qcom/sa515m-ccard-usb-ep.dts
new file mode 100755
index 00000000..d9ae9b7f
--- /dev/null
+++ b/qcom/sa515m-ccard-usb-ep.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "sa515m.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA515M CCARD USB-EP";
+	compatible = "qcom,sa515m-ccard",
+			"qcom,sa515m", "qcom,ccard";
+	qcom,board-id = <25 2>, <25 0x102>;
+};
diff --git a/qcom/sa515m-ccard.dts b/qcom/sa515m-ccard.dts
new file mode 100755
index 00000000..e29e0928
--- /dev/null
+++ b/qcom/sa515m-ccard.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "sa515m.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA515M CCARD";
+	compatible = "qcom,sa515m-ccard",
+			"qcom,sa515m", "qcom,ccard";
+	qcom,board-id = <25 2>, <25 0x102>;
+};
diff --git a/qcom/sa515m-v2-ccard-eth-ep.dts b/qcom/sa515m-v2-ccard-eth-ep.dts
new file mode 100755
index 00000000..76293214
--- /dev/null
+++ b/qcom/sa515m-v2-ccard-eth-ep.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "sa515m-v2.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA515M CCARD ETH V2";
+	compatible = "qcom,sa515m-ccard",
+		"qcom,sa515m", "qcom,ccard";
+	qcom,board-id = <25 5>, <25 0x105>;
+};
diff --git a/qcom/sa515m-v2-ccard-pcie-ep.dts b/qcom/sa515m-v2-ccard-pcie-ep.dts
new file mode 100755
index 00000000..d9f79703
--- /dev/null
+++ b/qcom/sa515m-v2-ccard-pcie-ep.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "sa515m-v2.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA515M CCARD PCIE-EP V2";
+	compatible = "qcom,sa515m-ccard",
+		"qcom,sa515m", "qcom,ccard";
+	qcom,board-id = <25 1>, <25 0x101>;
+};
diff --git a/qcom/sa515m-v2-ccard-usb-ep.dts b/qcom/sa515m-v2-ccard-usb-ep.dts
new file mode 100755
index 00000000..703b2b85
--- /dev/null
+++ b/qcom/sa515m-v2-ccard-usb-ep.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "sa515m-v2.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA515M CCARD USB-EP V2";
+	compatible = "qcom,sa515m-ccard",
+		"qcom,sa515m", "qcom,ccard";
+	qcom,board-id = <25 2>, <25 0x102>;
+};
diff --git a/qcom/sa515m-v2-ccard.dts b/qcom/sa515m-v2-ccard.dts
new file mode 100755
index 00000000..34d2f155
--- /dev/null
+++ b/qcom/sa515m-v2-ccard.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "sa515m-v2.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA515M CCARD V2";
+	compatible = "qcom,sa515m-ccard",
+			"qcom,sa515m", "qcom,ccard";
+	qcom,board-id = <25 0>, <25 0x100>;
+};
diff --git a/qcom/sa515m-v2-ttp-pcie-ep.dts b/qcom/sa515m-v2-ttp-pcie-ep.dts
new file mode 100755
index 00000000..15311502
--- /dev/null
+++ b/qcom/sa515m-v2-ttp-pcie-ep.dts
@@ -0,0 +1,9 @@
+/dts-v1/;
+
+#include "sa515m-v2.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA515M TTP PCIE-EP";
+	compatible = "qcom,sa515m";
+	qcom,board-id = <30 1> , <30 0x101>;
+};
diff --git a/qcom/sa515m-v2-ttp-usb-ep.dts b/qcom/sa515m-v2-ttp-usb-ep.dts
new file mode 100755
index 00000000..b1d11734
--- /dev/null
+++ b/qcom/sa515m-v2-ttp-usb-ep.dts
@@ -0,0 +1,9 @@
+/dts-v1/;
+
+#include "sa515m-v2.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA515M TTP USB EP";
+	compatible = "qcom,sa515m";
+	qcom,board-id = <30 2> , <30 0x102>;
+};
diff --git a/qcom/sa515m-v2-ttp.dts b/qcom/sa515m-v2-ttp.dts
new file mode 100755
index 00000000..b5a41e44
--- /dev/null
+++ b/qcom/sa515m-v2-ttp.dts
@@ -0,0 +1,9 @@
+/dts-v1/;
+
+#include "sa515m-v2.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA515M TTP ";
+	compatible = "qcom,sa515m";
+	qcom,board-id = <30 0x0> , <30 0x100>;
+};
diff --git a/qcom/sa515m-v2.dtsi b/qcom/sa515m-v2.dtsi
new file mode 100755
index 00000000..1746852b
--- /dev/null
+++ b/qcom/sa515m-v2.dtsi
@@ -0,0 +1,17 @@
+#include "sa515m.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA515M V2";
+	compatible = "qcom,sa515m";
+	qcom,msm-id = <418 0x20000>;
+};
+
+&soc {
+	blsp1_uart2b_hs: uartb@830000 { /* BLSP1 UART2 : GPIO: 63,64,65,66 */
+		compatible = "qcom,msm-hsuart-v14";
+		reg = <0x830000 0x200>,
+		    <0x804000 0x23000>;
+		interrupts = <0 1 2>;
+		status="ok";
+	};
+};
diff --git a/qcom/sa515m.dtsi b/qcom/sa515m.dtsi
new file mode 100755
index 00000000..8e0b2039
--- /dev/null
+++ b/qcom/sa515m.dtsi
@@ -0,0 +1,263 @@
+/ {
+	#address-cells = <1>;
+	#size-cells = <1>;
+	model = "Qualcomm Technologies, Inc. SA515M";
+	compatible = "qcom,sa515m";
+	qcom,msm-id = <418 0x20000>;
+
+	interrupt-parent = <&intc>;
+
+	memory { device_type = "memory"; reg = <0 0>; };
+
+	chosen: chosen { };
+
+	aliases {
+	};
+
+	reserved_mem: reserved-memory {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+
+		mpss_adsp_mem: mpss_adsp_region@90800000 {
+			no-map;
+			reg = <0x90800000 0xd800000>;
+			label = "mpss_adsp_mem";
+		};
+
+		tz_apps_mem: tz_apps_region@0x90000000 {
+			no-map;
+			reg = <0x90000000 0x500000>;
+			label = "tz_apps_mem";
+		};
+
+		tz_mem: tz_region@8ff00000 {
+			no-map;
+			reg = <0x8ff00000 0x100000>;
+			label = "tz_mem";
+		};
+
+		smem_mem: smem_region@8fe40000 {
+			no-map;
+			reg = <0x8fe40000 0xc0000>;
+			label = "smem_mem";
+		};
+
+		peripheral2_mem: peripheral2_region@8fd00000 {
+			no-map;
+			reg = <0x8fd00000 0x140000>;
+			label = "peripheral2_mem";
+		};
+
+		ipa_fw_mem: ipa_fw_region@8fced000 {
+			no-map;
+			reg = <0x8fced000 0x10000>;
+			label = "ipa_fw_mem";
+		};
+
+		secdata_mem: secdata_region@8fcfd000 {
+			no-map;
+			reg = <0x8fcfd000 0x1000>;
+			label = "secdata_mem";
+		};
+
+		ac_db_mem: ac_db_region@8fc80000 {
+			no-map;
+			reg = <0x8fc80000 0x40000>;
+			label = "ac_db_mem";
+		};
+
+		hyp_mem: hyp_region@8fc00000 {
+			no-map;
+			reg = <0x8fc00000 0x80000>;
+			label = "hyp_mem";
+		};
+
+		mpss_debug_mem: mpss_debug_region@8ef00000 {
+			no-map;
+			reg = <0x8ef00000 0x800000>;
+			label = "mpss_debug_mem";
+		};
+
+		guard_mem: guard_region@8eeff000 {
+			no-map;
+			reg = <0x8eeff000 0x1000>;
+			label = "guard_mem";
+		};
+
+		qseecom_mem: qseecom_region@0 {
+			compatible = "shared-dma-pool";
+			reusable;
+			alignment = <0x400000>;
+			size = <0x1400000>;
+		};
+
+		qseecom_ta_mem: qseecom_ta_region@0 {
+			compatible = "shared-dma-pool";
+			reusable;
+			alignment = <0x400000>;
+			size = <0x400000>;
+		};
+
+		audio_mem: audio_region@0 {
+			compatible = "shared-dma-pool";
+			no-map;
+			size = <0x400000>;
+		};
+
+		dump_mem: mem_dump_region {
+			compatible = "shared-dma-pool";
+			reusable;
+			size = <0x400000>;
+		};
+	};
+
+	cpus {
+		#size-cells = <0>;
+		#address-cells = <1>;
+
+		CPU0: cpu@0 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a7";
+			reg = <0x0>;
+			enable-method = "psci";
+			#cooling-cells = <2>;
+		};
+	};
+
+	soc: soc { };
+
+	firmware: firmware {};
+};
+
+&soc {
+	#address-cells = <1>;
+	#size-cells = <1>;
+	ranges;
+
+	intc: interrupt-controller@17800000 {
+		compatible = "qcom,msm-qgic2";
+		interrupt-controller;
+		interrupt-parent = <&intc>;
+		#interrupt-cells = <3>;
+		reg = <0x17800000 0x1000>,
+		      <0x17802000 0x1000>;
+	};
+
+	pdc: interrupt-controller@b210000 {
+		compatible = "qcom,sa515m-pdc";
+		reg = <0xb210000 0x30000>;
+		qcom,pdc-ranges = <0 147 52>, <52 266 32>;
+		#interrupt-cells = <3>;
+		interrupt-parent = <&intc>;
+		interrupt-controller;
+	};
+
+	timer {
+		compatible = "arm,armv7-timer";
+		interrupts = <1 13 0xf08>,
+			<1 12 0xf08>,
+			<1 10 0xf08>,
+			<1 11 0xf08>;
+		clock-frequency = <19200000>;
+	};
+
+	timer@17820000 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+		compatible = "arm,armv7-timer-mem";
+		reg = <0x17820000 0x1000>;
+		clock-frequency = <19200000>;
+
+		frame@17821000 {
+			frame-number = <0>;
+			interrupts = <0 7 0x4>,
+				     <0 6 0x4>;
+			reg = <0x17821000 0x1000>,
+			      <0x17822000 0x1000>;
+		};
+
+		frame@17823000 {
+			frame-number = <1>;
+			interrupts = <0 8 0x4>;
+			reg = <0x17823000 0x1000>;
+			status = "disabled";
+		};
+
+		frame@17824000 {
+			frame-number = <2>;
+			interrupts = <0 9 0x4>;
+			reg = <0x17824000 0x1000>;
+			status = "disabled";
+		};
+
+		frame@17825000 {
+			frame-number = <3>;
+			interrupts = <0 10 0x4>;
+			reg = <0x17825000 0x1000>;
+			status = "disabled";
+		};
+
+		frame@17826000 {
+			frame-number = <4>;
+			interrupts = <0 11 0x4>;
+			reg = <0x17826000 0x1000>;
+			status = "disabled";
+		};
+
+		frame@17827000 {
+			frame-number = <5>;
+			interrupts = <0 12 0x4>;
+			reg = <0x17827000 0x1000>;
+			status = "disabled";
+		};
+
+		frame@17828000 {
+			frame-number = <6>;
+			interrupts = <0 13 0x4>;
+			reg = <0x17828000 0x1000>;
+			status = "disabled";
+		};
+
+		frame@17829000 {
+			frame-number = <7>;
+			interrupts = <0 14 0x4>;
+			reg = <0x17829000 0x1000>;
+			status = "disabled";
+		};
+	};
+
+	restart_pshold: restart@c264000 {
+		compatible = "qcom,pshold";
+		reg = <0xc264000 0x4>,
+		      <0x1fd3000 0x4>,
+		      <0x00786070 0x4>;
+		reg-names = "pshold-base", "tcsr-boot-misc-detect",
+				"boot-config";
+		qcom,boot-config-shift = <4>;
+	};
+
+	qcom,wdt@17817000 {
+		compatible = "qcom,msm-watchdog";
+		reg = <0x17817000 0x1000>;
+		reg-names = "wdt-base";
+		interrupts = <1 3 0>, <1 2 0>;
+		qcom,bark-time = <11000>;
+		qcom,pet-time = <9360>;
+		qcom,wakeup-enable;
+	};
+
+	qcom,msm-rtb {
+		compatible = "qcom,msm-rtb";
+		qcom,rtb-size = <0x100000>;
+	};
+
+	serial_uart: serial@831000 {
+		compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
+		reg = <0x831000 0x200>;
+		interrupts = <0 26 0>;
+		status = "ok";
+	};
+
+};
diff --git a/qcom/sa6155p-vm-la-overlay.dts b/qcom/sa6155p-vm-la-overlay.dts
new file mode 100755
index 00000000..dbbc6acd
--- /dev/null
+++ b/qcom/sa6155p-vm-la-overlay.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+/plugin/;
+
+#include "sa6155p-vm.dtsi"
+#include "sa6155p-vm-la.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA6155P Virtual Machine";
+	compatible = "qcom,sa6155p";
+	qcom,pmic-name = "PM6150";
+	qcom,board-id = <0x1000001 0>, <0 0x1000001>;
+};
diff --git a/qcom/sa6155p-vm-la.dts b/qcom/sa6155p-vm-la.dts
index 8db9b60a..18501201 100755
--- a/qcom/sa6155p-vm-la.dts
+++ b/qcom/sa6155p-vm-la.dts
@@ -7,5 +7,5 @@
 	model = "Qualcomm Technologies, Inc. SA6155P Virtual Machine";
 	compatible = "qcom,sa6155p";
 	qcom,pmic-name = "PM6150";
-	qcom,board-id = <0 0x1000001>;
+	qcom,board-id = <0x1000001 0>, <0 0x1000001>;
 };
diff --git a/qcom/sa6155p-vm-la.dtsi b/qcom/sa6155p-vm-la.dtsi
index 99724b47..f99ff365 100755
--- a/qcom/sa6155p-vm-la.dtsi
+++ b/qcom/sa6155p-vm-la.dtsi
@@ -14,19 +14,23 @@
 };
 
 / {
-	rename_blk: rename_blk {
-		compatible = "qcom,blkdev-rename";
-		actual-dev = "vda", "vdb", "vdc",
-				"vdd", "vde", "vdf",
-				"vdg", "vdh", "vdi";
-		rename-dev = "system", "userdata", "vendor",
-				"persist", "modem", "bluetooth",
-				"misc", "vbmeta";
-		rename-dev-ab = "super", "userdata", "metadata",
-				"persist", "modem_a", "bluetooth_a",
-				"misc", "vbmeta_a", "vbmeta_b";
+	rename_devices: rename_devices {
+		compatible = "qcom,rename-devices";
+		rename_blk: rename_blk {
+			device-type = "block";
+			actual-dev = "vda", "vdb", "vdc",
+					"vdd", "vde", "vdf",
+					"vdg", "vdh", "vdi",
+					"vdj", "vdk";
+			rename-dev = "system", "userdata", "vendor",
+					"persist", "modem", "bluetooth",
+					"misc", "vbmeta", "boot", "dtbo";
+			rename-dev-ab = "super", "userdata", "metadata",
+					"persist", "modem_a", "bluetooth_a",
+					"misc", "vbmeta_a", "vbmeta_b",
+					"boot", "dtbo";
+		};
 	};
-
 };
 
 #include "display/quin-vm-display-la.dtsi"
diff --git a/qcom/sa6155p-vm-lv-overlay.dts b/qcom/sa6155p-vm-lv-overlay.dts
new file mode 100755
index 00000000..b731526f
--- /dev/null
+++ b/qcom/sa6155p-vm-lv-overlay.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+/plugin/;
+
+#include "sa6155p-vm.dtsi"
+#include "sa6155p-vm-lv.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA6155P Virtual Machine";
+	compatible = "qcom,sa6155p";
+	qcom,pmic-name = "PM6150";
+	qcom,board-id = <0 0x1000002>;
+};
diff --git a/qcom/sa8155-adp-star-lxc-overlay.dts b/qcom/sa8155-adp-star-lxc-overlay.dts
index b98910e9..7e4b7b33 100755
--- a/qcom/sa8155-adp-star-lxc-overlay.dts
+++ b/qcom/sa8155-adp-star-lxc-overlay.dts
@@ -5,7 +5,6 @@
 #include "display/sa8155-v2-adp-air-display-lxc-shd.dtsi"
 
 / {
-	model = "ADP-STAR";
 	compatible = "qcom,sa8155-adp-star", "qcom,sa8155",
 		"qcom,adp-star";
 	qcom,board-id = <25 0>;
diff --git a/qcom/sa8155-adp-star-overlay.dts b/qcom/sa8155-adp-star-overlay.dts
index 7a9369b9..43e4b601 100755
--- a/qcom/sa8155-adp-star-overlay.dts
+++ b/qcom/sa8155-adp-star-overlay.dts
@@ -5,7 +5,6 @@
 #include "display/sa8155-adp-star-display-shd.dtsi"
 
 / {
-	model = "ADP-STAR";
 	compatible = "qcom,sa8155-adp-star", "qcom,sa8155",
 		"qcom,adp-star";
 	qcom,board-id = <25 0>;
diff --git a/qcom/sa8155-v2-adp-air-lxc-overlay.dts b/qcom/sa8155-v2-adp-air-lxc-overlay.dts
index afc71383..e3dff994 100755
--- a/qcom/sa8155-v2-adp-air-lxc-overlay.dts
+++ b/qcom/sa8155-v2-adp-air-lxc-overlay.dts
@@ -6,7 +6,6 @@
 #include "display/sa8155-v2-adp-air-display-lxc-shd.dtsi"
 
 / {
-	model = "ADP-AIR";
 	compatible = "qcom,sa8155-v2-adp-air", "qcom,sa8155",
 		"qcom,adp-air";
 	qcom,board-id = <0X01000019 0>;
diff --git a/qcom/sa8155-v2-adp-air-overlay.dts b/qcom/sa8155-v2-adp-air-overlay.dts
index 9512d615..96fce7d9 100755
--- a/qcom/sa8155-v2-adp-air-overlay.dts
+++ b/qcom/sa8155-v2-adp-air-overlay.dts
@@ -6,7 +6,6 @@
 #include "display/sa8155-adp-star-display-shd.dtsi"
 
 / {
-	model = "ADP-AIR";
 	compatible = "qcom,sa8155-v2-adp-air", "qcom,sa8155",
 		"qcom,adp-air";
 	qcom,board-id = <0X01000019 0>;
diff --git a/qcom/sa8155-vm-la-mt-overlay.dts b/qcom/sa8155-vm-la-mt-overlay.dts
new file mode 100755
index 00000000..fb1944ab
--- /dev/null
+++ b/qcom/sa8155-vm-la-mt-overlay.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+/plugin/;
+
+#include "sa8155-vm.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA8155 Multi LA Virtual Machine";
+	compatible = "qcom,sa8155";
+	qcom,pmic-name = "PM8150";
+	qcom,board-id = <0x2000001 0>, <0 0x2000001>;
+};
+
diff --git a/qcom/sa8155-vm-la-mt.dts b/qcom/sa8155-vm-la-mt.dts
index f6de087a..5cad23ee 100755
--- a/qcom/sa8155-vm-la-mt.dts
+++ b/qcom/sa8155-vm-la-mt.dts
@@ -5,7 +5,7 @@
 
 / {
 	model = "Qualcomm Technologies, Inc. SA8155 Multi LA Virtual Machine";
-	compatible = "qcom,sa8155";
+	compatible = "qcom,sa8155", "qcom,quinvm";
 	qcom,pmic-name = "PM8150";
-	qcom,board-id = <0 0x2000001>;
+	qcom,board-id = <0x2000001 0>, <0 0x2000001>;
 };
diff --git a/qcom/sa8155-vm-la-mt.dtsi b/qcom/sa8155-vm-la-mt.dtsi
index 7eed7561..5a5408a7 100755
--- a/qcom/sa8155-vm-la-mt.dtsi
+++ b/qcom/sa8155-vm-la-mt.dtsi
@@ -8,17 +8,22 @@
 #include "display/quin-vm-display-la.dtsi"
 
 / {
-	rename_blk: rename_blk {
-		compatible = "qcom,blkdev-rename";
-		actual-dev = "vda", "vdb", "vdc",
-				"vdd", "vde", "vdf",
-				"vdg", "vdh", "vdi";
-		rename-dev = "system", "userdata", "vendor",
-				"persist", "modem", "bluetooth",
-				"misc", "vbmeta";
-		rename-dev-ab = "super", "userdata", "metadata",
-				"persist", "modem_a", "bluetooth_a",
-				"misc", "vbmeta_a", "vbmeta_b";
+	rename_devices: rename_devices {
+		compatible = "qcom,rename-devices";
+		rename_blk: rename_blk {
+			device-type = "block";
+			actual-dev = "vda", "vdb", "vdc",
+					"vdd", "vde", "vdf",
+					"vdg", "vdh", "vdi",
+					"vdj", "vdk";
+			rename-dev = "system", "userdata", "vendor",
+					"persist", "modem", "bluetooth",
+					"misc", "vbmeta", "boot", "dtbo";
+			rename-dev-ab = "super", "userdata", "metadata",
+					"persist", "modem_a", "bluetooth_a",
+					"misc", "vbmeta_a", "vbmeta_b",
+					"boot", "dtbo";
+		};
 	};
 
 	/delete-node/ cpus;
diff --git a/qcom/sa8155-vm-la-overlay.dts b/qcom/sa8155-vm-la-overlay.dts
new file mode 100755
index 00000000..1974fab7
--- /dev/null
+++ b/qcom/sa8155-vm-la-overlay.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+/plugin/;
+
+#include "sa8155-vm.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA8155 Single LA Virtual Machine";
+	compatible = "qcom,sa8155";
+	qcom,pmic-name = "PM8150";
+	qcom,board-id = <0x1000001 0>, <0 0x1000001>;
+};
+
diff --git a/qcom/sa8155-vm-la.dts b/qcom/sa8155-vm-la.dts
index 86c7c1e9..f2339d9c 100755
--- a/qcom/sa8155-vm-la.dts
+++ b/qcom/sa8155-vm-la.dts
@@ -5,7 +5,7 @@
 
 / {
 	model = "Qualcomm Technologies, Inc. SA8155 Single LA Virtual Machine";
-	compatible = "qcom,sa8155";
+	compatible = "qcom,sa8155", "qcom,quinvm";
 	qcom,pmic-name = "PM8150";
-	qcom,board-id = <0 0x1000001>;
+	qcom,board-id = <0x1000001 0>, <0 0x1000001>;
 };
diff --git a/qcom/sa8155-vm-la.dtsi b/qcom/sa8155-vm-la.dtsi
index 29e21ae5..adc128c2 100755
--- a/qcom/sa8155-vm-la.dtsi
+++ b/qcom/sa8155-vm-la.dtsi
@@ -14,17 +14,22 @@
 };
 
 / {
-	rename_blk: rename_blk {
-		compatible = "qcom,blkdev-rename";
-		actual-dev = "vda", "vdb", "vdc",
-				"vdd", "vde", "vdf",
-				"vdg", "vdh", "vdi";
-		rename-dev = "system", "userdata", "vendor",
-				"persist", "modem", "bluetooth",
-				"misc", "vbmeta";
-		rename-dev-ab = "super", "userdata", "metadata",
-				"persist", "modem_a", "bluetooth_a",
-				"misc", "vbmeta_a", "vbmeta_b";
+	rename_devices: rename_devices {
+		compatible = "qcom,rename-devices";
+		rename_blk: rename_blk {
+			device-type = "block";
+			actual-dev = "vda", "vdb", "vdc",
+					"vdd", "vde", "vdf",
+					"vdg", "vdh", "vdi",
+					"vdj", "vdk";
+			rename-dev = "system", "userdata", "vendor",
+					"persist", "modem", "bluetooth",
+					"misc", "vbmeta", "boot", "dtbo";
+			rename-dev-ab = "super", "userdata", "metadata",
+					"persist", "modem_a", "bluetooth_a",
+					"misc", "vbmeta_a", "vbmeta_b",
+					"boot", "dtbo";
+		};
 	};
 };
 
diff --git a/qcom/sa8155-vm-lv-mt-overlay.dts b/qcom/sa8155-vm-lv-mt-overlay.dts
new file mode 100755
index 00000000..2905259a
--- /dev/null
+++ b/qcom/sa8155-vm-lv-mt-overlay.dts
@@ -0,0 +1,13 @@
+/dts-v1/;
+/plugin/;
+
+#include "sa8155-vm.dtsi"
+#include "sa8155-vm-la.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA8155 Multi LV Virtual Machine";
+	compatible = "qcom,sa8155";
+	qcom,pmic-name = "PM8150";
+	qcom,board-id = <0 0x2000002>;
+};
+
diff --git a/qcom/sa8155-vm-lv-mt.dts b/qcom/sa8155-vm-lv-mt.dts
index 36145be2..340d6ed2 100755
--- a/qcom/sa8155-vm-lv-mt.dts
+++ b/qcom/sa8155-vm-lv-mt.dts
@@ -5,7 +5,7 @@
 
 / {
 	model = "Qualcomm Technologies, Inc. SA8155 Multi LV Virtual Machine";
-	compatible = "qcom,sa8155";
+	compatible = "qcom,sa8155", "qcom,quinvm";
 	qcom,pmic-name = "PM8150";
 	qcom,board-id = <0 0x2000002>;
 };
diff --git a/qcom/sa8155-vm-lv-overlay.dts b/qcom/sa8155-vm-lv-overlay.dts
new file mode 100755
index 00000000..3bc4b082
--- /dev/null
+++ b/qcom/sa8155-vm-lv-overlay.dts
@@ -0,0 +1,13 @@
+/dts-v1/;
+/plugin/;
+
+#include "sa8155-vm.dtsi"
+#include "sa8155-vm-la.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA8155 Single LV Virtual Machine";
+	compatible = "qcom,sa8155";
+	qcom,pmic-name = "PM8150";
+	qcom,board-id = <0 0x1000002>;
+};
+
diff --git a/qcom/sa8155-vm-lv.dts b/qcom/sa8155-vm-lv.dts
index 9056245c..79bca56c 100755
--- a/qcom/sa8155-vm-lv.dts
+++ b/qcom/sa8155-vm-lv.dts
@@ -5,7 +5,7 @@
 
 / {
 	model = "Qualcomm Technologies, Inc. SA8155 Single LV Virtual Machine";
-	compatible = "qcom,sa8155";
+	compatible = "qcom,sa8155", "qcom,quinvm";
 	qcom,pmic-name = "PM8150";
 	qcom,board-id = <0 0x1000002>;
 };
diff --git a/qcom/sa8155-vm.dtsi b/qcom/sa8155-vm.dtsi
index 43bbe337..29add28c 100755
--- a/qcom/sa8155-vm.dtsi
+++ b/qcom/sa8155-vm.dtsi
@@ -17,11 +17,33 @@
 		#address-cells = <2>;
 		#size-cells = <0>;
 
+		cluster_0_opp_table: opp-table0 {
+			compatible = "operating-points-v2";
+			opp-shared;
+
+			opp-2131200000 {
+				opp-hz = /bits/ 64 <2131200000>;
+				opp-microvolt = <948000>;
+			};
+		};
+
+		cluster_1_opp_table: opp-table1 {
+			compatible = "operating-points-v2";
+			opp-shared;
+
+			opp-1785600000 {
+				opp-hz = /bits/ 64 <1785600000>;
+				opp-microvolt = <892000>;
+			};
+		};
+
 		CPU0: cpu@0 {
 			device_type = "cpu";
 			compatible = "arm,armv8";
 			reg = <0x0 0x0>;
 			capacity-dmips-mhz = <1024>;
+			dynamic-power-coefficient = <374>;
+			operating-points-v2 = <&cluster_0_opp_table>;
 		};
 
 		CPU1: cpu@1 {
@@ -29,6 +51,8 @@
 			compatible = "arm,armv8";
 			reg = <0x0 0x1>;
 			capacity-dmips-mhz = <1024>;
+			dynamic-power-coefficient = <374>;
+			operating-points-v2 = <&cluster_0_opp_table>;
 		};
 
 		CPU2: cpu@2 {
@@ -36,6 +60,8 @@
 			compatible = "arm,armv8";
 			reg = <0x0 0x2>;
 			capacity-dmips-mhz = <1024>;
+			dynamic-power-coefficient = <374>;
+			operating-points-v2 = <&cluster_0_opp_table>;
 		};
 
 		CPU3: cpu@3 {
@@ -43,34 +69,44 @@
 			compatible = "arm,armv8";
 			reg = <0x0 0x3>;
 			capacity-dmips-mhz = <1024>;
+			dynamic-power-coefficient = <374>;
+			operating-points-v2 = <&cluster_0_opp_table>;
 		};
 
 		CPU4: cpu@4 {
 			device_type = "cpu";
 			compatible = "arm,armv8";
 			reg = <0x0 0x4>;
-			capacity-dmips-mhz = <351>;
+			capacity-dmips-mhz = <419>;
+			dynamic-power-coefficient = <100>;
+			operating-points-v2 = <&cluster_1_opp_table>;
 		};
 
 		CPU5: cpu@5 {
 			device_type = "cpu";
 			compatible = "arm,armv8";
 			reg = <0x0 0x5>;
-			capacity-dmips-mhz = <351>;
+			capacity-dmips-mhz = <419>;
+			dynamic-power-coefficient = <100>;
+			operating-points-v2 = <&cluster_1_opp_table>;
 		};
 
 		CPU6: cpu@6 {
 			device_type = "cpu";
 			compatible = "arm,armv8";
 			reg = <0x0 0x6>;
-			capacity-dmips-mhz = <351>;
+			capacity-dmips-mhz = <419>;
+			dynamic-power-coefficient = <100>;
+			operating-points-v2 = <&cluster_1_opp_table>;
 		};
 
 		CPU7: cpu@7 {
 			device_type = "cpu";
 			compatible = "arm,armv8";
 			reg = <0x0 0x7>;
-			capacity-dmips-mhz = <351>;
+			capacity-dmips-mhz = <419>;
+			dynamic-power-coefficient = <100>;
+			operating-points-v2 = <&cluster_1_opp_table>;
 		};
 
 		cpu-map {
diff --git a/qcom/sa8155p-adp-star-lxc-overlay.dts b/qcom/sa8155p-adp-star-lxc-overlay.dts
index 7cb054ee..314c348c 100755
--- a/qcom/sa8155p-adp-star-lxc-overlay.dts
+++ b/qcom/sa8155p-adp-star-lxc-overlay.dts
@@ -5,7 +5,6 @@
 #include "display/sa8155-v2-adp-air-display-lxc-shd.dtsi"
 
 / {
-	model = "ADP-STAR";
 	compatible = "qcom,sa8155p-adp-star", "qcom,sa8155p",
 		"qcom,adp-star";
 	qcom,board-id = <25 0>;
diff --git a/qcom/sa8155p-adp-star-overlay.dts b/qcom/sa8155p-adp-star-overlay.dts
index ee9142e3..d0ebf998 100755
--- a/qcom/sa8155p-adp-star-overlay.dts
+++ b/qcom/sa8155p-adp-star-overlay.dts
@@ -5,7 +5,6 @@
 #include "display/sa8155-adp-star-display-shd.dtsi"
 
 / {
-	model = "ADP-STAR";
 	compatible = "qcom,sa8155p-adp-star", "qcom,sa8155p",
 		"qcom,sa8155p-iot", "qcom,adp-star";
 	qcom,board-id = <25 0>;
diff --git a/qcom/sa8155p-v2-adp-air-lxc-overlay.dts b/qcom/sa8155p-v2-adp-air-lxc-overlay.dts
index 3c257f42..17db26d7 100755
--- a/qcom/sa8155p-v2-adp-air-lxc-overlay.dts
+++ b/qcom/sa8155p-v2-adp-air-lxc-overlay.dts
@@ -5,7 +5,6 @@
 #include "display/sa8155-v2-adp-air-display-lxc-shd.dtsi"
 
 / {
-	model = "ADP-AIR";
 	compatible = "qcom,sa8155p-v2-adp-air", "qcom,sa8155p",
 		"qcom,adp-air";
 	qcom,board-id = <0x01000019 0>;
diff --git a/qcom/sa8155p-v2-adp-air-overlay.dts b/qcom/sa8155p-v2-adp-air-overlay.dts
index 31355833..5a897c14 100755
--- a/qcom/sa8155p-v2-adp-air-overlay.dts
+++ b/qcom/sa8155p-v2-adp-air-overlay.dts
@@ -5,7 +5,6 @@
 #include "display/sa8155-adp-star-display-shd.dtsi"
 
 / {
-	model = "ADP-AIR";
 	compatible = "qcom,sa8155p-v2-adp-air", "qcom,sa8155p",
 		"qcom,sa8155p-iot", "qcom,adp-air";
 	qcom,board-id = <0x01000019 0>;
diff --git a/qcom/sa8195-vm-la-mt-overlay.dts b/qcom/sa8195-vm-la-mt-overlay.dts
new file mode 100755
index 00000000..28ec5a22
--- /dev/null
+++ b/qcom/sa8195-vm-la-mt-overlay.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+/plugin/;
+
+#include "sa8195-vm.dtsi"
+#include "sa8195-vm-la-mt.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA8195 Multi LA Virtual Machine";
+	compatible = "qcom,sa8195p", "qcom,quinvm";
+	qcom,pmic-name = "PM8195";
+	qcom,board-id = <0x2000001 0>, <0 0x2000001>;
+};
diff --git a/qcom/sa8195-vm-la-mt.dts b/qcom/sa8195-vm-la-mt.dts
index f5334f2b..d13b29af 100755
--- a/qcom/sa8195-vm-la-mt.dts
+++ b/qcom/sa8195-vm-la-mt.dts
@@ -7,5 +7,5 @@
 	model = "Qualcomm Technologies, Inc. SA8195 Multi LA Virtual Machine";
 	compatible = "qcom,sa8195p", "qcom,quinvm";
 	qcom,pmic-name = "PM8195";
-	qcom,board-id = <0 0x2000001>;
+	qcom,board-id = <0x2000001 0>, <0 0x2000001>;
 };
diff --git a/qcom/sa8195-vm-la-mt.dtsi b/qcom/sa8195-vm-la-mt.dtsi
index 92ddffcf..2b40b187 100755
--- a/qcom/sa8195-vm-la-mt.dtsi
+++ b/qcom/sa8195-vm-la-mt.dtsi
@@ -8,17 +8,22 @@
 #include "display/quin-vm-display-la.dtsi"
 
 / {
-	rename_blk: rename_blk {
-		compatible = "qcom,blkdev-rename";
-		actual-dev = "vda", "vdb", "vdc",
-				"vdd", "vde", "vdf",
-				"vdg", "vdh", "vdi";
-		rename-dev = "system", "userdata", "vendor",
-				"persist", "modem", "bluetooth",
-				"misc", "vbmeta";
-		rename-dev-ab = "super", "userdata", "metadata",
-				"persist", "modem_a", "bluetooth_a",
-				"misc", "vbmeta_a", "vbmeta_b";
+	rename_devices: rename_devices {
+		compatible = "qcom,rename-devices";
+		rename_blk: rename_blk {
+			device-type = "block";
+			actual-dev = "vda", "vdb", "vdc",
+					"vdd", "vde", "vdf",
+					"vdg", "vdh", "vdi",
+					"vdj", "vdk";
+			rename-dev = "system", "userdata", "vendor",
+					"persist", "modem", "bluetooth",
+					"misc", "vbmeta", "boot", "dtbo";
+			rename-dev-ab = "super", "userdata", "metadata",
+					"persist", "modem_a", "bluetooth_a",
+					"misc", "vbmeta_a", "vbmeta_b",
+					"boot", "dtbo";
+		};
 	};
 
 	/delete-node/ cpus;
diff --git a/qcom/sa8195-vm-la-overlay.dts b/qcom/sa8195-vm-la-overlay.dts
new file mode 100755
index 00000000..c12bc752
--- /dev/null
+++ b/qcom/sa8195-vm-la-overlay.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+/plugin/;
+
+#include "sa8195-vm.dtsi"
+#include "sa8195-vm-la.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA8195 Single LA Virtual Machine";
+	compatible = "qcom,sa8195p", "qcom,quinvm";
+	qcom,pmic-name = "PM8195";
+	qcom,board-id = <0x1000001 0>, <0 0x1000001>;
+};
diff --git a/qcom/sa8195-vm-la.dts b/qcom/sa8195-vm-la.dts
index 310ed37b..3881dc4e 100755
--- a/qcom/sa8195-vm-la.dts
+++ b/qcom/sa8195-vm-la.dts
@@ -7,5 +7,5 @@
 	model = "Qualcomm Technologies, Inc. SA8195 Single LA Virtual Machine";
 	compatible = "qcom,sa8195p", "qcom,quinvm";
 	qcom,pmic-name = "PM8195";
-	qcom,board-id = <0 0x1000001>;
+	qcom,board-id = <0x1000001 0>, <0 0x1000001>;
 };
diff --git a/qcom/sa8195-vm-la.dtsi b/qcom/sa8195-vm-la.dtsi
index e365d9f1..d593da87 100755
--- a/qcom/sa8195-vm-la.dtsi
+++ b/qcom/sa8195-vm-la.dtsi
@@ -15,17 +15,22 @@
 };
 
 / {
-	rename_blk: rename_blk {
-		compatible = "qcom,blkdev-rename";
-		actual-dev = "vda", "vdb", "vdc",
-				"vdd", "vde", "vdf",
-				"vdg", "vdh", "vdi";
-		rename-dev = "system", "userdata", "vendor",
-				"persist", "modem", "bluetooth",
-				"misc", "vbmeta";
-		rename-dev-ab = "super", "userdata", "metadata",
-				"persist", "modem_a", "bluetooth_a",
-				"misc", "vbmeta_a", "vbmeta_b";
+	rename_devices: rename_devices {
+		compatible = "qcom,rename-devices";
+		rename_blk: rename_blk {
+			device-type = "block";
+			actual-dev = "vda", "vdb", "vdc",
+					"vdd", "vde", "vdf",
+					"vdg", "vdh", "vdi",
+					"vdj", "vdk";
+			rename-dev = "system", "userdata", "vendor",
+					"persist", "modem", "bluetooth",
+					"misc", "vbmeta", "boot", "dtbo";
+			rename-dev-ab = "super", "userdata", "metadata",
+					"persist", "modem_a", "bluetooth_a",
+					"misc", "vbmeta_a", "vbmeta_b",
+					"boot", "dtbo";
+		};
 	};
 };
 
diff --git a/qcom/sa8195-vm-lv-lxc-overlay.dts b/qcom/sa8195-vm-lv-lxc-overlay.dts
new file mode 100755
index 00000000..711e58ff
--- /dev/null
+++ b/qcom/sa8195-vm-lv-lxc-overlay.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+/plugin/;
+
+#include "sa8195-vm.dtsi"
+#include "sa8195-vm-lv-lxc.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA8195 Single LV LXC Virtual Machine";
+	compatible = "qcom,sa8195p", "qcom,quinvm";
+	qcom,pmic-name = "PM8195";
+	qcom,board-id = <0 0x1000003>;
+};
diff --git a/qcom/sa8195-vm-lv-mt-overlay.dts b/qcom/sa8195-vm-lv-mt-overlay.dts
new file mode 100755
index 00000000..4db42046
--- /dev/null
+++ b/qcom/sa8195-vm-lv-mt-overlay.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+/plugin/;
+
+#include "sa8195-vm.dtsi"
+#include "sa8195-vm-lv-mt.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA8195 Multi LV Virtual Machine";
+	compatible = "qcom,sa8195p", "qcom,quinvm";
+	qcom,pmic-name = "PM8195";
+	qcom,board-id = <0 0x2000002>;
+};
diff --git a/qcom/sa8195-vm-lv-overlay.dts b/qcom/sa8195-vm-lv-overlay.dts
new file mode 100755
index 00000000..aedc2a5b
--- /dev/null
+++ b/qcom/sa8195-vm-lv-overlay.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+/plugin/;
+
+#include "sa8195-vm.dtsi"
+#include "sa8195-vm-lv.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA8195 Single LV Virtual Machine";
+	compatible = "qcom,sa8195p", "qcom,quinvm";
+	qcom,pmic-name = "PM8195";
+	qcom,board-id = <0 0x1000002>;
+};
diff --git a/qcom/sa8195p-adp-star-lxc-overlay.dts b/qcom/sa8195p-adp-star-lxc-overlay.dts
index a5a325aa..2b6abb3f 100755
--- a/qcom/sa8195p-adp-star-lxc-overlay.dts
+++ b/qcom/sa8195p-adp-star-lxc-overlay.dts
@@ -5,7 +5,6 @@
 #include "display/sa8195p-v2-adp-air-display-lxc-shd.dtsi"
 
 / {
-	model = "ADP-STAR";
 	compatible = "qcom,sa8195p-adp-star", "qcom,sa8195p",
 		"qcom,adp-star";
 	qcom,msm-id = <405 0x20000>;
diff --git a/qcom/sa8195p-adp-star-overlay.dts b/qcom/sa8195p-adp-star-overlay.dts
index dc01d941..834180fc 100755
--- a/qcom/sa8195p-adp-star-overlay.dts
+++ b/qcom/sa8195p-adp-star-overlay.dts
@@ -5,7 +5,6 @@
 #include "display/sa8195p-adp-star-display-shd.dtsi"
 
 / {
-	model = "ADP-STAR";
 	compatible = "qcom,sa8195p-adp-star", "qcom,sa8195p",
 		"qcom,adp-star";
 	qcom,msm-id = <405 0x20000>;
diff --git a/qcom/sa8195p-v2-adp-air-lxc-overlay.dts b/qcom/sa8195p-v2-adp-air-lxc-overlay.dts
index 579cc9c7..86976fcc 100755
--- a/qcom/sa8195p-v2-adp-air-lxc-overlay.dts
+++ b/qcom/sa8195p-v2-adp-air-lxc-overlay.dts
@@ -5,7 +5,6 @@
 #include "display/sa8195p-v2-adp-air-display-lxc-shd.dtsi"
 
 / {
-	model = "ADP-AIR";
 	compatible = "qcom,sa8195p-v2-adp-air", "qcom,sa8195p",
 		"qcom,adp-air";
 	qcom,board-id = <0x02010019 0>;
diff --git a/qcom/sa8195p-v2-adp-air-overlay.dts b/qcom/sa8195p-v2-adp-air-overlay.dts
index 99ea4827..82fd23a8 100755
--- a/qcom/sa8195p-v2-adp-air-overlay.dts
+++ b/qcom/sa8195p-v2-adp-air-overlay.dts
@@ -5,7 +5,6 @@
 #include "display/sa8195p-adp-star-display-shd.dtsi"
 
 / {
-	model = "ADP-AIR";
 	compatible = "qcom,sa8195p-v2-adp-air", "qcom,sa8195p",
 		"qcom,adp-air";
 	qcom,msm-id = <405 0x20000>;
diff --git a/qcom/scuba-coresight.dtsi b/qcom/scuba-coresight.dtsi
index bbcb275b..c1bcbbd5 100755
--- a/qcom/scuba-coresight.dtsi
+++ b/qcom/scuba-coresight.dtsi
@@ -1017,6 +1017,10 @@
 
 		coresight-name = "coresight-tmc-etf";
 
+		coresight-ctis = <&cti0 &cti6>;
+		cti-flush-trig-num = <1>;
+		cti-reset-trig-num = <5>;
+
 		clocks = <&rpmcc RPM_SMD_QDSS_CLK>;
 		clock-names = "apb_pclk";
 		ports {
@@ -1094,7 +1098,10 @@
 		arm,buffer-size = <0x400000>;
 		arm,scatter-gather;
 
-		coresight-ctis = <&cti0>;
+		coresight-ctis = <&cti0 &cti6>;
+		cti-flush-trig-num = <3>;
+		cti-reset-trig-num = <5>;
+
 		coresight-csr = <&csr>;
 
 		clocks = <&rpmcc RPM_SMD_QDSS_CLK>;
diff --git a/qcom/scuba-qrd-v2.dtsi b/qcom/scuba-qrd-v2.dtsi
index 0a2f3e1e..38e328b7 100755
--- a/qcom/scuba-qrd-v2.dtsi
+++ b/qcom/scuba-qrd-v2.dtsi
@@ -1,4 +1,5 @@
 #include "scuba-qrd.dtsi"
+#include "camera/scuba-camera-sensor-idp-v2.dtsi"
 
 &dsi_ili9881c_720p_video {
 	qcom,platform-reset-gpio = <&tlmm 97 0>;
diff --git a/qcom/scuba-thermal.dtsi b/qcom/scuba-thermal.dtsi
index a45c7785..5d91ca6b 100755
--- a/qcom/scuba-thermal.dtsi
+++ b/qcom/scuba-thermal.dtsi
@@ -44,7 +44,8 @@
 			<0x04411000 0x1ff>;
 		reg-names = "tsens_srot_physical",
 				"tsens_tm_physical";
-		interrupts = <0 275 0>, <0 190 0>;
+		interrupts = <GIC_SPI 275 IRQ_TYPE_LEVEL_HIGH>,
+				<GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;
 		interrupt-names = "tsens-upper-lower", "tsens-critical";
 		#thermal-sensor-cells = <1>;
 	};
@@ -584,65 +585,4 @@
 			};
 		};
 	};
-
-	mapss-lowf {
-		polling-delay-passive = <0>;
-		polling-delay = <0>;
-		thermal-governor = "low_limits_floor";
-		thermal-sensors = <&tsens0 0>;
-		tracks-low;
-
-		trips {
-			mapss_trip: mapss-trip {
-				temperature = <5000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-		};
-
-		cooling-maps {
-			cx_vdd_cdev {
-				trip = <&mapss_trip>;
-				cooling-device = <&cx_cdev 0 0>;
-			};
-
-			mx_vdd_cdev {
-				trip = <&mapss_trip>;
-				cooling-device = <&mx_cdev 0 0>;
-			};
-
-			modem_vdd_cdev {
-				trip = <&mapss_trip>;
-				cooling-device = <&modem_vdd 0 0>;
-			};
-
-			adsp_vdd_cdev {
-				trip = <&mapss_trip>;
-				cooling-device = <&adsp_vdd 0 0>;
-			};
-		};
-	};
-
-	mapss-lowc {
-		polling-delay-passive = <0>;
-		polling-delay = <0>;
-		thermal-governor = "low_limits_cap";
-		thermal-sensors = <&tsens0 0>;
-		tracks-low;
-
-		trips {
-			mapss_cap_trip: mapss-cap-trip {
-				temperature = <5000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-		};
-
-		cooling-maps {
-			lmh_cpu_cdev {
-				trip = <&mapss_cap_trip>;
-				cooling-device = <&lmh_cpu_vdd 1 1>;
-			};
-		};
-	};
 };
diff --git a/qcom/scuba.dtsi b/qcom/scuba.dtsi
index c413d23b..fed069e7 100755
--- a/qcom/scuba.dtsi
+++ b/qcom/scuba.dtsi
@@ -10,6 +10,17 @@
 #include <dt-bindings/clock/qcom,dispcc-scuba.h>
 #include <dt-bindings/clock/qcom,rpmcc.h>
 
+#define MHZ_TO_MBPS(mhz, w) ((mhz * 1000000 * w) / (1024 * 1024))
+#define BW_OPP_ENTRY(mhz, w) opp-mhz {opp-hz = /bits/ 64 <MHZ_TO_MBPS(mhz, w)>;}
+
+#define BW_OPP_ENTRY_DDR(mhz, w, ddrtype) opp-mhz {\
+				opp-hz = /bits/ 64 <MHZ_TO_MBPS(mhz, w)>;\
+				opp-supported-hw = <ddrtype>;}
+
+#define DDR_TYPE_LPDDR3		5
+#define DDR_TYPE_LPDDR4X	7
+
+
 / {
 	model = "Qualcomm Technologies, Inc. SCUBA";
 	compatible = "qcom,scuba";
@@ -764,6 +775,106 @@
 		hyplog-size-offset = <0x414>;
 	};
 
+	qcom_rng: qrng@4453000 {
+		compatible = "qcom,msm-rng";
+		reg = <0x4453000 0x1000>;
+		interconnect-names = "data_path";
+		interconnects = <&bimc MASTER_AMPSS_M0 &config_noc SLAVE_HWKM>;
+		qcom,no-qrng-config;
+		clock-names = "km_clk_src";
+		clocks = <&rpmcc RPM_SMD_HWKM_CLK>;
+	};
+
+	qcom_hwkm: hwkm@4440000 {
+		compatible = "qcom,hwkm";
+		reg = <0x4440000 0x9000>, <0x4750000 0x9000>;
+		reg-names = "km_master", "ice_slave";
+		qcom,enable-hwkm-clk;
+		clock-names = "km_clk_src";
+		clocks = <&rpmcc RPM_SMD_HWKM_CLK>;
+		qcom,op-freq-hz = <75000000>;
+	};
+
+	qcom_cedev: qcedev@1b20000 {
+		compatible = "qcom,qcedev";
+		reg = <0x1b20000 0x20000>,
+			<0x1b04000 0x24000>;
+		reg-names = "crypto-base","crypto-bam-base";
+		interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;
+		qcom,bam-pipe-pair = <3>;
+		qcom,ce-hw-instance = <0>;
+		qcom,ce-device = <0>;
+		qcom,ce-hw-shared;
+		qcom,bam-ee = <0>;
+		clock-names =
+			"core_clk_src", "core_clk",
+			"iface_clk", "bus_clk";
+		clocks =
+			<&rpmcc RPM_SMD_CE1_CLK>,
+			<&rpmcc RPM_SMD_CE1_CLK>,
+			<&rpmcc RPM_SMD_CE1_CLK>,
+			<&rpmcc RPM_SMD_CE1_CLK>;
+		qcom,ce-opp-freq = <192000000>;
+		qcom,smmu-s1-enable;
+		interconnect-names = "data_path";
+		interconnects = <&system_noc MASTER_CRYPTO_CORE0 &bimc SLAVE_EBI_CH0>;
+		iommus = <&apps_smmu 0x0086 0x0011>,
+			 <&apps_smmu 0x0096 0x0011>;
+		qcom,iommu-dma = "atomic";
+
+		qcom_cedev_ns_cb {
+			compatible = "qcom,qcedev,context-bank";
+			label = "ns_context";
+			iommus = <&apps_smmu 0x92 0>,
+				<&apps_smmu 0x98 0x1>,
+				<&apps_smmu 0x9F 0>;
+		};
+
+		qcom_cedev_s_cb {
+			compatible = "qcom,qcedev,context-bank";
+			label = "secure_context";
+			iommus = <&apps_smmu 0x93 0>,
+				<&apps_smmu 0x9C 0x1>,
+				<&apps_smmu 0x9E 0>;
+			qcom,iommu-vmid = <0x9>; /* VMID_CP_BITSTREAM */
+			qcom,secure-context-bank;
+		};
+	};
+
+	qcom_crypto: qcrypto@1b20000 {
+		compatible = "qcom,qcrypto";
+		reg = <0x1b20000 0x20000>,
+			<0x1b04000 0x24000>;
+		reg-names = "crypto-base","crypto-bam-base";
+		interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;
+		qcom,bam-pipe-pair = <2>;
+		qcom,ce-hw-instance = <0>;
+		qcom,ce-device = <0>;
+		qcom,bam-ee = <0>;
+		qcom,ce-hw-shared;
+		qcom,clk-mgmt-sus-res;
+		clock-names =
+			"core_clk_src", "core_clk",
+			"iface_clk", "bus_clk";
+		clocks =
+			<&rpmcc RPM_SMD_CE1_CLK>,
+			<&rpmcc RPM_SMD_CE1_CLK>,
+			<&rpmcc RPM_SMD_CE1_CLK>,
+			<&rpmcc RPM_SMD_CE1_CLK>;
+		qcom,use-sw-aes-cbc-ecb-ctr-algo;
+		qcom,use-sw-aes-xts-algo;
+		qcom,use-sw-aes-ccm-algo;
+		qcom,use-sw-ahash-algo;
+		qcom,use-sw-aead-algo;
+		qcom,use-sw-hmac-algo;
+		qcom,smmu-s1-enable;
+		interconnect-names = "data_path";
+		interconnects = <&system_noc MASTER_CRYPTO_CORE0 &bimc SLAVE_EBI_CH0>;
+		iommus = <&apps_smmu 0x0084 0x0011>,
+			<&apps_smmu 0x0094 0x0011>;
+		qcom,iommu-dma = "atomic";
+	};
+
 	eud: qcom,msm-eud@1610000 {
 		compatible = "qcom,msm-eud";
 		interrupt-names = "eud_irq";
@@ -997,6 +1108,128 @@
 		#freq-domain-cells = <2>;
 	};
 
+	ddr_bw_opp_table: ddr-bw-opp-table {
+		compatible = "operating-points-v2";
+		BW_OPP_ENTRY_DDR( 200, 8, 0xA0); /* 1525 MB/s */
+		BW_OPP_ENTRY_DDR( 300, 8, 0xA0); /* 2288 MB/s */
+		BW_OPP_ENTRY_DDR( 451, 8, 0xA0); /* 3440 MB/s */
+		BW_OPP_ENTRY_DDR( 547, 8, 0xA0); /* 4173 MB/s */
+		BW_OPP_ENTRY_DDR( 681, 8, 0xA0); /* 5195 MB/s */
+		BW_OPP_ENTRY_DDR( 768, 8, 0xA0); /* 5859 MB/s */
+		BW_OPP_ENTRY_DDR( 931, 8, 0x20); /* 7102 MB/s */
+		BW_OPP_ENTRY_DDR(1017, 8, 0x80); /* 7759 MB/s */
+		BW_OPP_ENTRY_DDR(1353, 8, 0x80); /*10322 MB/s */
+		BW_OPP_ENTRY_DDR(1555, 8, 0x80); /*11863 MB/s */
+		BW_OPP_ENTRY_DDR(1804, 8, 0x80); /*13763 MB/s */
+	};
+
+	suspendable_ddr_bw_opp_table: suspendable-ddr-bw-opp-table {
+		compatible = "operating-points-v2";
+		BW_OPP_ENTRY_DDR(   0, 8, 0xA0); /*    0 MB/s */
+		BW_OPP_ENTRY_DDR( 200, 8, 0xA0); /* 1525 MB/s */
+		BW_OPP_ENTRY_DDR( 300, 8, 0xA0); /* 2288 MB/s */
+		BW_OPP_ENTRY_DDR( 451, 8, 0xA0); /* 3440 MB/s */
+		BW_OPP_ENTRY_DDR( 547, 8, 0xA0); /* 4173 MB/s */
+		BW_OPP_ENTRY_DDR( 681, 8, 0xA0); /* 5195 MB/s */
+		BW_OPP_ENTRY_DDR( 768, 8, 0xA0); /* 5859 MB/s */
+		BW_OPP_ENTRY_DDR( 931, 8, 0x20); /* 7102 MB/s */
+		BW_OPP_ENTRY_DDR(1017, 8, 0x80); /* 7759 MB/s */
+		BW_OPP_ENTRY_DDR(1353, 8, 0x80); /*10322 MB/s */
+		BW_OPP_ENTRY_DDR(1555, 8, 0x80); /*11863 MB/s */
+		BW_OPP_ENTRY_DDR(1804, 8, 0x80); /*13763 MB/s */
+	};
+
+	cpu_cpu_ddr_bw: qcom,cpu-cpu-ddr-bw {
+		compatible = "qcom,devfreq-icc-ddr";
+		governor = "performance";
+		interconnects = <&bimc MASTER_AMPSS_M0 &bimc SLAVE_EBI_CH0>;
+		qcom,active-only;
+		operating-points-v2 = <&ddr_bw_opp_table>;
+	};
+
+	cpu_cpu_ddr_bwmon: qcom,cpu-cpu-ddr-bwmon@01b8e200 {
+		compatible = "qcom,bimc-bwmon4";
+		reg = <0x01b8e300 0x100>, <0x01b8e200 0x100>;
+		reg-names = "base", "global_base";
+		interrupts = <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>;
+		qcom,mport = <0>;
+		qcom,hw-timer-hz = <19200000>;
+		qcom,target-dev = <&cpu_cpu_ddr_bw>;
+		qcom,count-unit = <0x10000>;
+	};
+
+	cpu0_cpu_ddr_latfloor: qcom,cpu0-cpu-ddr-latfloor {
+		compatible = "qcom,devfreq-icc-ddr";
+		governor = "performance";
+		interconnects = <&bimc MASTER_AMPSS_M0 &bimc SLAVE_EBI_CH0>;
+		qcom,active-only;
+		operating-points-v2 = <&ddr_bw_opp_table>;
+	};
+
+	cpu0_cpu_ddr_lat: qcom,cpu0-cpu-ddr-lat {
+		compatible = "qcom,devfreq-icc-ddr";
+		governor = "performance";
+		interconnects = <&bimc MASTER_AMPSS_M0 &bimc SLAVE_EBI_CH0>;
+		qcom,active-only;
+		operating-points-v2 = <&ddr_bw_opp_table>;
+	};
+
+	cpu0_memlat_cpugrp: qcom,cpu0-cpugrp {
+		compatible = "qcom,arm-memlat-cpugrp";
+		qcom,cpulist = <&CPU0 &CPU1 &CPU2 &CPU3>;
+
+		cpu0_cpu_ddr_latmon: qcom,cpu0-cpu-ddr-latmon {
+			compatible = "qcom,arm-memlat-mon";
+			qcom,cpulist = <&CPU0 &CPU1 &CPU2 &CPU3>;
+			qcom,target-dev = <&cpu0_cpu_ddr_lat>;
+			qcom,cachemiss-ev = <0x17>;
+			ddr3-map {
+				qcom,ddr-type = <DDR_TYPE_LPDDR3>;
+				qcom,core-dev-table =
+					<  614400 MHZ_TO_MBPS( 200, 8) >,
+					< 1017600 MHZ_TO_MBPS( 451, 8) >,
+					< 1420000 MHZ_TO_MBPS( 547, 8) >,
+					< 1612800 MHZ_TO_MBPS( 768, 8) >,
+					< 2000000 MHZ_TO_MBPS( 931, 8) >;
+			};
+
+			ddr4-map {
+				qcom,ddr-type = <DDR_TYPE_LPDDR4X>;
+				qcom,core-dev-table =
+					<  614400 MHZ_TO_MBPS( 451, 8) >,
+					< 1017600 MHZ_TO_MBPS( 768, 8) >,
+					< 1420000 MHZ_TO_MBPS(1017, 8) >,
+					< 1612800 MHZ_TO_MBPS(1555, 8) >,
+					< 2000000 MHZ_TO_MBPS(1804, 8) >;
+			};
+		};
+
+		cpu0_computemon: qcom,cpu0-computemon {
+			compatible = "qcom,arm-compute-mon";
+			qcom,cpulist = <&CPU0 &CPU1 &CPU2 &CPU3>;
+			qcom,target-dev = <&cpu0_cpu_ddr_latfloor>;
+			ddr3-map {
+				qcom,ddr-type = <DDR_TYPE_LPDDR3>;
+				qcom,core-dev-table =
+					<  864000 MHZ_TO_MBPS( 200, 8) >,
+					< 1017600 MHZ_TO_MBPS( 300, 8) >,
+					< 1420000 MHZ_TO_MBPS( 451, 8) >,
+					< 1804800 MHZ_TO_MBPS( 547, 8) >,
+					< 2000000 MHZ_TO_MBPS( 931, 8) >;
+			};
+
+			ddr4-map {
+				qcom,ddr-type = <DDR_TYPE_LPDDR4X>;
+				qcom,core-dev-table =
+					<  864000 MHZ_TO_MBPS( 300, 8) >,
+					< 1017600 MHZ_TO_MBPS( 547, 8) >,
+					< 1420000 MHZ_TO_MBPS( 768, 8) >,
+					< 1804800 MHZ_TO_MBPS(1017, 8) >,
+					< 2000000 MHZ_TO_MBPS(1804, 8) >;
+			};
+		};
+	};
+
 	spmi_bus: qcom,spmi@1c40000 {
 		compatible = "qcom,spmi-pmic-arb";
 		reg = <0x1c40000 0x1100>,
diff --git a/qcom/sm6150-audio.dtsi b/qcom/sm6150-audio.dtsi
index 28a322c5..60c14fe2 100755
--- a/qcom/sm6150-audio.dtsi
+++ b/qcom/sm6150-audio.dtsi
@@ -1,6 +1,6 @@
 
 #include "msm-audio-lpass.dtsi"
-#include "dt-bindings/clock/qcom,audio-ext-clk.h"
+#include <dt-bindings/clock/qcom,audio-ext-clk.h>
 
 &msm_audio_ion {
 	iommus = <&apps_smmu 0x1721 0x0>;
diff --git a/qcom/sm6150-pinctrl.dtsi b/qcom/sm6150-pinctrl.dtsi
index ae350f78..cd80a03f 100755
--- a/qcom/sm6150-pinctrl.dtsi
+++ b/qcom/sm6150-pinctrl.dtsi
@@ -1843,6 +1843,19 @@
 			};
 		};
 
+		cam_sensor_dvdd_en: cam_sensor_dvdd_en {
+			mux {
+				pins = "gpio9";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio9";
+				bias-pull-down; /* PULL DOWN */
+				drive-strength = <2>; /* 2 MA */
+			};
+		};
+
 		hs0_i2s_sck_ws {
 			hs0_i2s_sck_sleep: hs0_i2s_sck_sleep {
 				mux {
diff --git a/qcom/sm6150.dtsi b/qcom/sm6150.dtsi
index 6bbe606e..c6b775a0 100755
--- a/qcom/sm6150.dtsi
+++ b/qcom/sm6150.dtsi
@@ -276,8 +276,7 @@
 				compatible = "android,fstab";
 				vendor {
 					compatible = "android,vendor";
-					dev = "/dev/block/platform/soc
-						/1d84000.ufshc/by-name/vendor";
+					dev = "/dev/block/platform/soc/1d84000.ufshc/by-name/vendor";
 					type = "ext4";
 					mnt_flags = "ro,barrier=1,discard";
 					fsmgr_flags = "wait,slotselect,avb";
@@ -1569,6 +1568,7 @@
 		qcom,bus-vector-names = "MIN",
 					"MAX";
 		qcom,instance-type = "ufs";
+		qcom,num-fde-slots = <31>;
 	};
 
 	ufsphy_mem: ufsphy_mem@1d87000 {
@@ -2407,6 +2407,7 @@
 		qcom,bus-vector-names = "MIN",
 					"MAX";
 		qcom,instance-type = "sdcc";
+		qcom,num-fde-slots = <31>;
 	};
 
 	sdhc_1: sdhci@7c4000 {
diff --git a/qcom/sm8150-npu.dtsi b/qcom/sm8150-npu.dtsi
index 8e17b87a..1fd7c77f 100755
--- a/qcom/sm8150-npu.dtsi
+++ b/qcom/sm8150-npu.dtsi
@@ -2,7 +2,7 @@
 	msm_npu: qcom,msm_npu@9800000 {
 		compatible = "qcom,msm-npu";
 		status = "ok";
-		reg = <0x9800000 0x40000>,
+		reg = <0x9800000 0x15000>,
 			<0x9900000 0x10000>,
 			<0x9960200 0x600>;
 		reg-names = "tcm", "core", "bwmon";
diff --git a/qcom/sm8150.dtsi b/qcom/sm8150.dtsi
index 1b48036b..2d9305d8 100755
--- a/qcom/sm8150.dtsi
+++ b/qcom/sm8150.dtsi
@@ -1919,6 +1919,7 @@
 		qcom,bus-vector-names = "MIN",
 					"MAX";
 		qcom,instance-type = "ufs";
+		qcom,num-fde-slots = <31>;
 	};
author	QC Publisher <qcpublisher@qti.qualcomm.com>	2022-04-27 14:26:00 -0700
committer	Andrew Evans <andrewevans@google.com>	2022-05-11 19:20:37 -0700
commit	a1db91e244fb83cfdfdd181b0294c3926c0675cc (patch)
tree	dcc99e5d049f45163175a10bc6aa9cdeb53046b5
parent	0ab0ff32e282ff7e00e26a6760a6724ca93c0a5f (diff)
download	devicetree-a1db91e244fb83cfdfdd181b0294c3926c0675cc.tar.gz