diff --git a/qcom/Makefile b/qcom/Makefile
index 11c4367e0875..e2749c79a6c2 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -35,7 +35,7 @@ bengal-guamna-gwlc-evt-overlay.dtbo-base := bengal-moto-base.dtb
 dtbo-$(CONFIG_BORNEO_DTB) += \
         bengal-borneo-evt-overlay.dtbo
 
-bengal-borneo-evt-overlay.dtbo-base := bengal-moto-base.dtb
+bengal-borneo-evt-overlay.dtbo-base := bengal-moto-base-borneo.dtb
 
 else
 ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
diff --git a/qcom/bengal-borneo-moto-thermal.dtsi b/qcom/bengal-borneo-moto-thermal.dtsi
index dcc412a41683..e879da7eb306 100644
--- a/qcom/bengal-borneo-moto-thermal.dtsi
+++ b/qcom/bengal-borneo-moto-thermal.dtsi
@@ -11,26 +11,87 @@
         };
 };
 
+&pmi632_vadc {
+	skin_therm {
+		reg = <ADC_GPIO1_PU2>;
+		label = "conn_therm";
+		qcom,ratiometric;
+		qcom,hw-settle-time = <200>;
+		qcom,pre-scaling = <1 1>;
+	};
+
+	conn_therm {
+		reg = <ADC_GPIO2_PU2>;
+		label = "skin_therm";
+		qcom,ratiometric;
+		qcom,hw-settle-time = <200>;
+		qcom,pre-scaling = <1 1>;
+	};
+};
+
+&pmi632_adc_tm {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	io-channels = <&pmi632_vadc ADC_GPIO1_PU2>,
+			 <&pmi632_vadc ADC_GPIO2_PU2>;
+
+	/* Channel nodes */
+	skin_therm {
+		reg = <ADC_GPIO1_PU2>;
+		qcom,ratiometric;
+		qcom,hw-settle-time = <200>;
+	};
+
+	conn_therm {
+		reg = <ADC_GPIO2_PU2>;
+		qcom,ratiometric;
+		qcom,hw-settle-time = <200>;
+	};
+};
+
+
+&pm6125_vadc {
+	msm_therm {
+		reg = <ADC_GPIO2_PU2>;
+		label = "msm_therm";
+		qcom,ratiometric;
+		qcom,hw-settle-time = <200>;
+		qcom,pre-scaling = <1 1>;
+	};
+};
+
+&pm6125_adc_tm_iio {
+	msm_therm {
+		reg = <ADC_GPIO2_PU2>;
+		qcom,ratiometric;
+		qcom,hw-settle-time = <200>;
+	};
+};
+
 &thermal_zones {
 	camera-therm-usr {
                 status = "disabled";
         };
-	
-	camera_therm {
-                polling-delay-passive = <0>;
-                polling-delay = <0>;
-                thermal-governor = "user_space";
-                thermal-sensors = <&pm6125_adc_tm_iio ADC_GPIO1_PU2>;
-                wake-capable-sensor;
-                trips {
-                        active-config0 {
-                                temperature = <125000>;
-                                hysteresis = <1000>;
-                                type = "passive";
-                        };
-                };
+
+	emmc-ufs-therm-usr {
+                status = "disabled";
         };
 
+	pa_therm0 {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&pm6125_adc_tm_iio ADC_GPIO2_PU2>;
+		wake-capable-sensor;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+		};
+	};
+
         xo-therm-usr {
 		status = "disabled";
 	};
@@ -54,7 +115,7 @@
 		status = "disabled";
 	};
 
-	pa_therm0 {
+	msm_therm {
                 polling-delay-passive = <0>;
                 polling-delay = <0>;
                 thermal-governor = "user_space";
@@ -73,7 +134,7 @@
 		status = "disabled";
 	};
 
-	msm_therm {
+	quiet_therm {
                 polling-delay-passive = <0>;
                 polling-delay = <0>;
                 thermal-governor = "user_space";
@@ -92,7 +153,7 @@
 		status = "disabled";
 	};
 
-	chg_therm {
+	camera_therm {
                 polling-delay-passive = <0>;
                 polling-delay = <0>;
                 thermal-governor = "user_space";
@@ -106,6 +167,21 @@
                         };
                 };
         };
+
+	chg_therm {
+                polling-delay-passive = <0>;
+                polling-delay = <0>;
+                thermal-governor = "user_space";
+                thermal-sensors = <&pmi632_adc_tm ADC_GPIO1_PU2>;
+                wake-capable-sensor;
+                trips {
+                        active-config0 {
+                                temperature = <125000>;
+                                hysteresis = <1000>;
+                                type = "passive";
+                        };
+                };
+        };
 };
 
 &mdss_mdp {
diff --git a/qcom/bengal-moto-base-borneo.dts b/qcom/bengal-moto-base-borneo.dts
new file mode 100644
index 000000000000..6f5a1ddb528f
--- /dev/null
+++ b/qcom/bengal-moto-base-borneo.dts
@@ -0,0 +1,53 @@
+/* Copyright (c) 2020, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+/dts-v1/;
+
+#include "bengal.dtsi"
+
+/ {
+	qcom,board-id = <0 0>;
+	channel-id-map = "";
+/*
+ * Some nodes need labels assigned to appear in __symbols__
+ */
+	chosen: chosen { };
+	aliases: aliases { };
+	reserved_memory: reserved-memory { };
+	mot_batterydata: qcom,battery-data { };
+	utags: utags { };
+	hw: hw { };
+};
+
+&pmi632_charger {
+        /delete-property/ qcom,sw-jeita-enable;
+        /delete-property/ qcom,step-charging-enable;
+        /delete-property/ qcom,hw-die-temp-mitigation;
+        /delete-property/ qcom,hw-connector-mitigation;
+};
+
+&pm6125_vadc {
+	/delete-node/ emmc_ufs_therm;
+};
+
+&pm6125_adc_tm_iio {
+	/delete-node/ emmc_ufs_therm;
+};
+
+&pmi632_vadc {
+	/delete-node/ conn_therm;
+	/delete-node/ skin_therm;
+};
+
+&pmi632_adc_tm {
+	/delete-node/ skin_therm;
+};