ARM: dts: msm: Add DT support for Bengal nopmi

Add support for nopmi version of Bengal platform.

Change-Id: I850a960ceb76f3062a664cb54eee136d53b5fd82

29 files changed, 373 insertions, 267 deletions

diff --git a/qcom/Makefile b/qcom/Makefile
index a4b5be3a..e460dc41 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -132,6 +132,7 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
                 bengal-rumi-overlay.dtbo \
                 bengal-qrd-overlay.dtbo \
                 bengal-idp-overlay.dtbo \
+                bengal-idp-nopmi-overlay.dtbo \
                 bengal-idp-usbc-overlay.dtbo \
                 bengalp-idp-overlay.dtbo \
                 bengal-idp-1gb-overlay.dtbo \
@@ -150,6 +151,7 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
 bengal-rumi-overlay.dtbo-base := bengal.dtb
 bengal-qrd-overlay.dtbo-base := bengal.dtb
 bengal-idp-overlay.dtbo-base := bengal.dtb
+bengal-idp-nopmi-overlay.dtbo-base := bengal.dtb
 bengal-idp-usbc-overlay.dtbo-base := bengal.dtb
 bengalp-idp-overlay.dtbo-base := bengalp.dtb
 bengal-idp-1gb-overlay.dtbo-base := bengal-1gb.dtb
@@ -168,6 +170,7 @@ else
 dtb-$(CONFIG_ARCH_BENGAL) += bengal-rumi.dtb \
                 bengal-qrd.dtb \
 		bengal-idp.dtb \
+		bengal-idp-nopmi.dtb \
 		bengal-idp-usbc.dtb \
 		bengalp-idp.dtb \
 		bengal-idp-1gb.dtb \
diff --git a/qcom/bengal-idp-low-ram.dtsi b/qcom/bengal-idp-low-ram.dtsi
index eef3e49b..f0456538 100644
--- a/qcom/bengal-idp-low-ram.dtsi
+++ b/qcom/bengal-idp-low-ram.dtsi
@@ -1 +1,2 @@
 #include "bengal-idp.dtsi"
+#include "bengal-idp-pmi632.dtsi"
diff --git a/qcom/bengal-idp-nopmi-overlay.dts b/qcom/bengal-idp-nopmi-overlay.dts
new file mode 100644
index 00000000..1bb7fc94
--- /dev/null
+++ b/qcom/bengal-idp-nopmi-overlay.dts
@@ -0,0 +1,13 @@
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include "bengal-idp-nopmi.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. BENGAL IDP nopmi";
+	compatible = "qcom,bengal-idp", "qcom,bengal", "qcom,idp";
+	qcom,msm-id = <417 0x10000>, <444 0x10000>;
+	qcom,board-id = <34 0>;
+	qcom,pmic-id = <0x2D 0x0 0x0 0x0>;
+};
diff --git a/qcom/bengal-idp-nopmi.dts b/qcom/bengal-idp-nopmi.dts
new file mode 100644
index 00000000..a9f8f46a
--- /dev/null
+++ b/qcom/bengal-idp-nopmi.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+
+#include "bengal.dtsi"
+#include "bengal-idp-nopmi.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. BENGAL IDP nopmi";
+	compatible = "qcom,bengal-idp", "qcom,bengal", "qcom,idp";
+	qcom,board-id = <34 0>;
+	qcom,pmic-id = <0x2D 0x0 0x0 0x0>;
+};
diff --git a/qcom/bengal-idp-nopmi.dtsi b/qcom/bengal-idp-nopmi.dtsi
new file mode 100644
index 00000000..7511ce65
--- /dev/null
+++ b/qcom/bengal-idp-nopmi.dtsi
@@ -0,0 +1,24 @@
+#include "bengal-idp.dtsi"
+
+&led_flash_rear {
+	/delete-property/ flash-source;
+	/delete-property/ torch-source;
+	/delete-property/ switch-source;
+};
+
+&led_flash_rear_aux {
+	/delete-property/ flash-source;
+	/delete-property/ torch-source;
+	/delete-property/ switch-source;
+};
+
+&led_flash_rear_aux2 {
+	/delete-property/ flash-source;
+	/delete-property/ torch-source;
+	/delete-property/ switch-source;
+};
+
+&sde_dsi {
+	/delete-property/ lab-supply;
+	/delete-property/ ibb-supply;
+};
diff --git a/qcom/bengal-idp-overlay.dts b/qcom/bengal-idp-overlay.dts
index 5b1e7f3b..31af8abb 100644
--- a/qcom/bengal-idp-overlay.dts
+++ b/qcom/bengal-idp-overlay.dts
@@ -3,10 +3,13 @@
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include "bengal-idp.dtsi"
+#include "bengal-idp-pmi632.dtsi"
+#include "bengal-thermal-pmi632-overlay.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. BENGAL IDP";
 	compatible = "qcom,bengal-idp", "qcom,bengal", "qcom,idp";
 	qcom,msm-id = <417 0x10000>, <444 0x10000>;
 	qcom,board-id = <34 0>;
+	qcom,pmic-id = <0x2D 0x25 0x0 0x0>;
 };
diff --git a/qcom/bengal-idp-pmi632.dtsi b/qcom/bengal-idp-pmi632.dtsi
new file mode 100644
index 00000000..ac778bd2
--- /dev/null
+++ b/qcom/bengal-idp-pmi632.dtsi
@@ -0,0 +1,64 @@
+#include "bengal-pmi632.dtsi"
+
+&pmi632_qg {
+	qcom,battery-data = <&mtp_batterydata>;
+	qcom,qg-iterm-ma = <100>;
+	qcom,hold-soc-while-full;
+	qcom,linearize-soc;
+	qcom,qg-use-s7-ocv;
+};
+
+&pmi632_charger {
+	qcom,battery-data = <&mtp_batterydata>;
+	qcom,suspend-input-on-debug-batt;
+	qcom,sw-jeita-enable;
+	qcom,step-charging-enable;
+	qcom,hvdcp2-max-icl-ua = <2000000>;
+	/* SMB1355 only */
+	qcom,sec-charger-config = <2>;
+	dpdm-supply = <&qusb_phy0>;
+	qcom,charger-temp-max = <800>;
+	qcom,smb-temp-max = <800>;
+	qcom,auto-recharge-soc = <98>;
+	qcom,flash-disable-soc = <10>;
+	qcom,hw-die-temp-mitigation;
+	qcom,hw-connector-mitigation;
+	qcom,connector-internal-pull-kohm = <100>;
+	qcom,float-option = <1>;
+	qcom,thermal-mitigation = <3000000 2500000
+			2000000 1500000 1000000 500000>;
+};
+
+&usb0 {
+	extcon = <&pmi632_charger>, <&eud>;
+};
+
+&smb1355 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&smb_int_default>;
+	interrupt-parent = <&tlmm>;
+	interrupts = <105 IRQ_TYPE_LEVEL_LOW>;
+	status = "ok";
+};
+
+&smb1355_charger {
+	pinctrl-names = "default";
+	pinctrl-0 = <&smb_en_default &pmi632_sense_default &pmi632_ctm_default>;
+	qcom,parallel-mode = <1>;
+	qcom,disable-ctm;
+	qcom,hw-die-temp-mitigation;
+	status = "ok";
+};
+
+&dsi_td4330_truly_v2_video {
+	qcom,platform-bklight-en-gpio = <&pmi632_gpios 6 0>;
+};
+
+&dsi_td4330_truly_v2_cmd {
+	qcom,platform-bklight-en-gpio = <&pmi632_gpios 6 0>;
+};
+
+&dsi_nt36525_truly_video {
+	qcom,platform-bklight-en-gpio = <&pmi632_gpios 6 0>;
+};
+
diff --git a/qcom/bengal-idp-usbc-overlay.dts b/qcom/bengal-idp-usbc-overlay.dts
index 4f2bb4c6..53da1e43 100644
--- a/qcom/bengal-idp-usbc-overlay.dts
+++ b/qcom/bengal-idp-usbc-overlay.dts
@@ -3,6 +3,7 @@
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include "bengal-idp.dtsi"
+#include "bengal-idp-pmi632.dtsi"
 #include "bengal-idp-usbc.dtsi"
 
 / {
diff --git a/qcom/bengal-idp-usbc.dts b/qcom/bengal-idp-usbc.dts
index c9e9b249..a0ae3f57 100644
--- a/qcom/bengal-idp-usbc.dts
+++ b/qcom/bengal-idp-usbc.dts
@@ -2,6 +2,7 @@
 
 #include "bengal.dtsi"
 #include "bengal-idp.dtsi"
+#include "bengal-idp-pmi632.dtsi"
 #include "bengal-idp-usbc.dtsi"
 
 / {
diff --git a/qcom/bengal-idp.dts b/qcom/bengal-idp.dts
index 5c41c0d3..1ad45c71 100644
--- a/qcom/bengal-idp.dts
+++ b/qcom/bengal-idp.dts
@@ -2,9 +2,12 @@
 
 #include "bengal.dtsi"
 #include "bengal-idp.dtsi"
+#include "bengal-thermal-pmi632-overlay.dtsi"
+#include "bengal-idp-pmi632.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. BENGAL IDP";
 	compatible = "qcom,bengal-idp", "qcom,bengal", "qcom,idp";
 	qcom,board-id = <34 0>;
+	qcom,pmic-id = <0x2D 0x25 0x0 0x0>;
 };
diff --git a/qcom/bengal-idp.dtsi b/qcom/bengal-idp.dtsi
index 6989918c..160eb3ce 100644
--- a/qcom/bengal-idp.dtsi
+++ b/qcom/bengal-idp.dtsi
@@ -6,13 +6,6 @@
 #include "bengal-sde-display.dtsi"
 #include "camera/bengal-camera-sensor-idp.dtsi"
 
-&soc {
-	mtp_batterydata: qcom,battery-data {
-		qcom,batt-id-range-pct = <15>;
-		#include "qg-batterydata-alium-3600mah.dtsi"
-	};
-};
-
 &qupv3_se1_i2c {
 	status = "ok";
 	#include "smb1355.dtsi"
@@ -64,68 +57,11 @@
 	};
 };
 
-&pmi632_qg {
-	qcom,battery-data = <&mtp_batterydata>;
-	qcom,qg-iterm-ma = <100>;
-	qcom,hold-soc-while-full;
-	qcom,linearize-soc;
-	qcom,qg-use-s7-ocv;
-};
-
-&pmi632_charger {
-	qcom,battery-data = <&mtp_batterydata>;
-	qcom,suspend-input-on-debug-batt;
-	qcom,sw-jeita-enable;
-	qcom,step-charging-enable;
-	qcom,hvdcp2-max-icl-ua = <2000000>;
-	/* SMB1355 only */
-	qcom,sec-charger-config = <2>;
-	dpdm-supply = <&qusb_phy0>;
-	qcom,charger-temp-max = <800>;
-	qcom,smb-temp-max = <800>;
-	qcom,auto-recharge-soc = <98>;
-	qcom,flash-disable-soc = <10>;
-	qcom,hw-die-temp-mitigation;
-	qcom,hw-connector-mitigation;
-	qcom,connector-internal-pull-kohm = <100>;
-	qcom,float-option = <1>;
-	qcom,thermal-mitigation = <3000000 2500000
-			2000000 1500000 1000000 500000>;
-};
-
-&pmi632_gpios {
-	smb_en {
-		smb_en_default: smb_en_default {
-			pins = "gpio2";
-			function = "func1";
-			output-enable;
-		};
-	};
-
-	pmi632_sense {
-		/* GPIO 7 and 8 are external-sense pins for PMI632 */
-		pmi632_sense_default: pmi632_sense_default {
-			pins = "gpio7", "gpio8";
-			bias-high-impedance;	/* disable the GPIO */
-			bias-disable;		/* no-pull */
-		};
-	};
-
-	pmi632_ctm {
-		/* Disable GPIO1 for h/w base mitigation */
-		pmi632_ctm_default: pmi632_ctm_default {
-			pins = "gpio1";
-			bias-high-impedance;	/* disable the GPIO */
-			bias-disable;		/* no-pull */
-		};
-	};
-};
-
 &pm6125_gpios {
 
 	rf_pa1_therm {
 		rf_pa1_therm_default: rf_pa1_therm_default {
-			 pins = "gpio7";
+			pins = "gpio7";
 			 bias-high-impedance;
 		};
 	};
@@ -141,10 +77,6 @@
 	};
 };
 
-&usb0 {
-	extcon = <&pmi632_charger>, <&eud>;
-};
-
 &soc {
 	gpio_keys {
 		compatible = "gpio-keys";
@@ -202,23 +134,6 @@
 	};
 };
 
-&smb1355 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&smb_int_default>;
-	interrupt-parent = <&tlmm>;
-	interrupts = <105 IRQ_TYPE_LEVEL_LOW>;
-	status = "ok";
-};
-
-&smb1355_charger {
-	pinctrl-names = "default";
-	pinctrl-0 = <&smb_en_default &pmi632_sense_default &pmi632_ctm_default>;
-	qcom,parallel-mode = <1>;
-	qcom,disable-ctm;
-	qcom,hw-die-temp-mitigation;
-	status = "ok";
-};
-
 &sdhc_1 {
 	vdd-supply = <&L24A>;
 	qcom,vdd-voltage-level = <2960000 2960000>;
@@ -302,7 +217,6 @@
 	qcom,mdss-dsi-bl-min-level = <1>;
 	qcom,mdss-dsi-bl-max-level = <4095>;
 	qcom,platform-reset-gpio = <&tlmm 82 0>;
-	qcom,platform-bklight-en-gpio = <&pmi632_gpios 6 0>;
 };
 
 &dsi_td4330_truly_v2_cmd {
@@ -314,7 +228,6 @@
 	qcom,mdss-dsi-bl-max-level = <4095>;
 	qcom,platform-te-gpio = <&tlmm 81 0>;
 	qcom,platform-reset-gpio = <&tlmm 82 0>;
-	qcom,platform-bklight-en-gpio = <&pmi632_gpios 6 0>;
 };
 
 &dsi_nt36525_truly_video {
@@ -325,7 +238,6 @@
 	qcom,mdss-dsi-bl-min-level = <1>;
 	qcom,mdss-dsi-bl-max-level = <4095>;
 	qcom,platform-reset-gpio = <&tlmm 82 0>;
-	qcom,platform-bklight-en-gpio = <&pmi632_gpios 6 0>;
 };
 
 &dsi_r66451_amoled_hd_90hz_video {
diff --git a/qcom/bengal-iot-idp.dtsi b/qcom/bengal-iot-idp.dtsi
index eef3e49b..f0456538 100644
--- a/qcom/bengal-iot-idp.dtsi
+++ b/qcom/bengal-iot-idp.dtsi
@@ -1 +1,2 @@
 #include "bengal-idp.dtsi"
+#include "bengal-idp-pmi632.dtsi"
diff --git a/qcom/bengal-iot.dtsi b/qcom/bengal-iot.dtsi
index 6d93a7a8..794b85be 100644
--- a/qcom/bengal-iot.dtsi
+++ b/qcom/bengal-iot.dtsi
@@ -1,4 +1,5 @@
 #include "bengal.dtsi"
+#include "bengal-pmi632.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. BENGAL-IOT";
diff --git a/qcom/bengal-low-ram.dtsi b/qcom/bengal-low-ram.dtsi
index 8179bf41..05c53c52 100644
--- a/qcom/bengal-low-ram.dtsi
+++ b/qcom/bengal-low-ram.dtsi
@@ -1,4 +1,5 @@
 #include "bengal.dtsi"
+#include "bengal-pmi632.dtsi"
 / {
 };
 
diff --git a/qcom/bengal-pmi632.dtsi b/qcom/bengal-pmi632.dtsi
new file mode 100644
index 00000000..f6fd69ad
--- /dev/null
+++ b/qcom/bengal-pmi632.dtsi
@@ -0,0 +1,127 @@
+#include "pmi632.dtsi"
+
+&soc {
+	mtp_batterydata: qcom,battery-data {
+		qcom,batt-id-range-pct = <15>;
+		#include "qg-batterydata-alium-3600mah.dtsi"
+	};
+};
+
+&pmi632_vadc {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&conn_therm_default &skin_therm_default>;
+
+	conn_therm {
+		reg = <ADC_GPIO1_PU2>;
+		label = "conn_therm";
+		qcom,ratiometric;
+		qcom,hw-settle-time = <200>;
+		qcom,pre-scaling = <1 1>;
+	};
+
+	skin_therm {
+		reg = <ADC_GPIO2_PU2>;
+		label = "skin_therm";
+		qcom,ratiometric;
+		qcom,hw-settle-time = <200>;
+		qcom,pre-scaling = <1 1>;
+	};
+};
+
+&pmi632_gpios {
+	conn_therm {
+		conn_therm_default: conn_therm_default {
+			pins = "gpio1";
+			bias-high-impedance;
+		};
+	};
+
+	skin_therm {
+		skin_therm_default: skin_therm_default {
+			pins = "gpio3";
+			bias-high-impedance;
+		};
+	};
+};
+
+&pmi632_adc_tm {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	io-channels = <&pmi632_vadc ADC_GPIO2_PU2>;
+
+	/* Channel nodes */
+	skin_therm {
+		reg = <ADC_GPIO2_PU2>;
+		qcom,ratiometric;
+		qcom,hw-settle-time = <200>;
+	};
+};
+
+&pmi632_gpios {
+	smb_en {
+		smb_en_default: smb_en_default {
+			pins = "gpio2";
+			function = "func1";
+			output-enable;
+		 };
+	};
+
+	pmi632_sense {
+		/* GPIO 7 and 8 are external-sense pins for PMI632 */
+		pmi632_sense_default: pmi632_sense_default {
+			pins = "gpio7", "gpio8";
+			bias-high-impedance;    /* disable the GPIO */
+			bias-disable;           /* no-pull */
+		};
+	};
+
+	pmi632_ctm {
+		/* Disable GPIO1 for h/w base mitigation */
+		pmi632_ctm_default: pmi632_ctm_default {
+			pins = "gpio1";
+			bias-high-impedance;    /* disable the GPIO */
+			bias-disable;           /* no-pull */
+		};
+	};
+};
+
+&pmi632_gpios {
+	disp_pins {
+		disp_pins_default: disp_pins_default {
+			pins = "gpio6";
+			function = "func1";
+			qcom,drive-strength = <2>;
+			power-source = <0>;
+			bias-disable;
+			output-low;
+		};
+	};
+};
+
+&thermal_zones {
+	chg-skin-therm-usr {
+		thermal-sensors = <&pmi632_adc_tm ADC_GPIO2_PU2>;
+	};
+
+	quiet-therm-step {
+		cooling-maps {
+			batt_cdev1 {
+				cooling-device = <&pmi632_charger 2 2>;
+			};
+
+			batt_cdev2 {
+				cooling-device = <&pmi632_charger 4 4>;
+			};
+
+			batt_cdev3 {
+				cooling-device = <&pmi632_charger 6 6>;
+			};
+
+			batt_cdev4 {
+				cooling-device = <&pmi632_charger 7 7>;
+			};
+		};
+	};
+};
diff --git a/qcom/bengal-qrd-overlay.dts b/qcom/bengal-qrd-overlay.dts
index 1a4bfdca..b2dff929 100644
--- a/qcom/bengal-qrd-overlay.dts
+++ b/qcom/bengal-qrd-overlay.dts
@@ -1,6 +1,7 @@
 /dts-v1/;
 /plugin/;
 
+#include "bengal-pmi632.dtsi"
 #include "bengal-qrd.dtsi"
 
 / {
diff --git a/qcom/bengal-qrd.dts b/qcom/bengal-qrd.dts
index 8d1c0939..d80d65e2 100644
--- a/qcom/bengal-qrd.dts
+++ b/qcom/bengal-qrd.dts
@@ -1,6 +1,7 @@
 /dts-v1/;
 
 #include "bengal.dtsi"
+#include "bengal-pmi632.dtsi"
 #include "bengal-qrd.dtsi"
 
 / {
diff --git a/qcom/bengal-qrd.dtsi b/qcom/bengal-qrd.dtsi
index 18858d38..851535cf 100644
--- a/qcom/bengal-qrd.dtsi
+++ b/qcom/bengal-qrd.dtsi
@@ -2,6 +2,7 @@
 #include <dt-bindings/iio/qcom,spmi-vadc.h>
 #include <dt-bindings/input/input.h>
 #include "bengal-thermal-overlay.dtsi"
+#include "bengal-thermal-pmi632-overlay.dtsi"
 #include "bengal-audio-overlay.dtsi"
 #include "bengal-sde-display.dtsi"
 #include "camera/bengal-camera-sensor-qrd.dtsi"
diff --git a/qcom/bengal-rumi-overlay.dts b/qcom/bengal-rumi-overlay.dts
index 87c19bae..8440ce03 100644
--- a/qcom/bengal-rumi-overlay.dts
+++ b/qcom/bengal-rumi-overlay.dts
@@ -2,6 +2,7 @@
 /plugin/;
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
+#include "bengal-pmi632.dtsi"
 #include "bengal-rumi.dtsi"
 
 / {
diff --git a/qcom/bengal-rumi.dts b/qcom/bengal-rumi.dts
index b443a849..f2efdfa9 100644
--- a/qcom/bengal-rumi.dts
+++ b/qcom/bengal-rumi.dts
@@ -2,6 +2,7 @@
 /memreserve/ 0x90000000 0x00000100;
 
 #include "bengal.dtsi"
+#include "bengal-pmi632.dtsi"
 #include "bengal-rumi.dtsi"
 
 / {
diff --git a/qcom/bengal-sde-display.dtsi b/qcom/bengal-sde-display.dtsi
index d9fcada4..b6d7337b 100644
--- a/qcom/bengal-sde-display.dtsi
+++ b/qcom/bengal-sde-display.dtsi
@@ -5,19 +5,6 @@
 #include "dsi-panel-r66451-hd-plus-90hz-cmd.dtsi"
 #include <dt-bindings/clock/mdss-14nm-pll-clk.h>
 
-&pmi632_gpios {
-	disp_pins {
-		disp_pins_default: disp_pins_default {
-			pins = "gpio6";
-			function = "func1";
-			qcom,drive-strength = <2>;
-			power-source = <0>;
-			bias-disable;
-			output-low;
-		};
-	};
-};
-
 &soc {
 	dsi_panel_pwr_supply: dsi_panel_pwr_supply {
 		#address-cells = <1>;
diff --git a/qcom/bengal-thermal-overlay.dtsi b/qcom/bengal-thermal-overlay.dtsi
index bfc70d78..cea18dc7 100644
--- a/qcom/bengal-thermal-overlay.dtsi
+++ b/qcom/bengal-thermal-overlay.dtsi
@@ -1,24 +1,6 @@
 #include <dt-bindings/thermal/thermal.h>
 
 &thermal_zones {
-	pmi632-tz {
-		cooling-maps {
-			trip0_bat {
-				trip = <&pmi632_trip0>;
-				cooling-device =
-					<&pmi632_charger (THERMAL_MAX_LIMIT-1)
-						(THERMAL_MAX_LIMIT-1)>;
-			};
-
-			trip1_bat {
-				trip = <&pmi632_trip1>;
-				cooling-device =
-					<&pmi632_charger THERMAL_MAX_LIMIT
-						THERMAL_MAX_LIMIT>;
-			};
-		};
-	};
-
 	pm6125-tz {
 		cooling-maps {
 			trip0_cpu0 {
@@ -71,94 +53,6 @@
 			};
 		};
 	};
-
-	pmi632-bcl-lvl0 {
-		cooling-maps {
-			cpu0_cdev {
-				trip = <&bcl_lvl0>;
-				cooling-device =
-					<&CPU0 (THERMAL_MAX_LIMIT-5)
-						(THERMAL_MAX_LIMIT-5)>;
-			};
-
-			cpu4_cdev {
-				trip = <&bcl_lvl0>;
-				cooling-device =
-					<&CPU4 (THERMAL_MAX_LIMIT-5)
-						(THERMAL_MAX_LIMIT-5)>;
-			};
-		};
-	};
-
-	pmi632-bcl-lvl1 {
-		cooling-maps {
-			cpu0_cdev {
-				trip = <&bcl_lvl1>;
-				cooling-device =
-					<&CPU0 (THERMAL_MAX_LIMIT-4)
-						(THERMAL_MAX_LIMIT-4)>;
-			};
-
-			cpu4_cdev {
-				trip = <&bcl_lvl1>;
-				cooling-device =
-					<&CPU4 (THERMAL_MAX_LIMIT-4)
-						(THERMAL_MAX_LIMIT-4)>;
-			};
-
-			cpu6_cdev {
-				trip = <&bcl_lvl1>;
-				cooling-device = <&cpu6_isolate 1 1>;
-			};
-
-			cpu7_cdev {
-				trip = <&bcl_lvl1>;
-				cooling-device = <&cpu7_isolate 1 1>;
-			};
-		};
-	};
-
-	pmi632-bcl-lvl2 {
-		cooling-maps {
-			cpu4_cdev {
-				trip = <&bcl_lvl2>;
-				cooling-device = <&cpu4_isolate 1 1>;
-			};
-
-			cpu5_cdev {
-				trip = <&bcl_lvl2>;
-				cooling-device = <&cpu5_isolate 1 1>;
-			};
-		};
-	};
-
-	soc {
-		cooling-maps {
-			soc_cpu0 {
-				trip = <&pmi632_low_soc>;
-				cooling-device =
-					<&CPU0 (THERMAL_MAX_LIMIT-4)
-						(THERMAL_MAX_LIMIT-4)>;
-			};
-
-			soc_cpu4 {
-				trip = <&pmi632_low_soc>;
-				cooling-device =
-					<&CPU4 (THERMAL_MAX_LIMIT-4)
-						(THERMAL_MAX_LIMIT-4)>;
-			};
-
-			soc_cpu6 {
-				trip = <&pmi632_low_soc>;
-				cooling-device = <&cpu6_isolate 1 1>;
-			};
-
-			soc_cpu7 {
-				trip = <&pmi632_low_soc>;
-				cooling-device = <&cpu7_isolate 1 1>;
-			};
-		};
-	};
 };
 
 &mdss_mdp {
diff --git a/qcom/bengal-thermal-pmi632-overlay.dtsi b/qcom/bengal-thermal-pmi632-overlay.dtsi
new file mode 100644
index 00000000..67710464
--- /dev/null
+++ b/qcom/bengal-thermal-pmi632-overlay.dtsi
@@ -0,0 +1,109 @@
+#include <dt-bindings/thermal/thermal.h>
+
+&thermal_zones {
+	pmi632-tz {
+		cooling-maps {
+			trip0_bat {
+				trip = <&pmi632_trip0>;
+				cooling-device =
+					<&pmi632_charger (THERMAL_MAX_LIMIT-1)
+						(THERMAL_MAX_LIMIT-1)>;
+			};
+
+			trip1_bat {
+				trip = <&pmi632_trip1>;
+				cooling-device =
+					<&pmi632_charger THERMAL_MAX_LIMIT
+						THERMAL_MAX_LIMIT>;
+			};
+		};
+	};
+
+	pmi632-bcl-lvl0 {
+		cooling-maps {
+			cpu0_cdev {
+				trip = <&bcl_lvl0>;
+				cooling-device =
+					<&CPU0 (THERMAL_MAX_LIMIT-5)
+						(THERMAL_MAX_LIMIT-5)>;
+			};
+
+			cpu4_cdev {
+				trip = <&bcl_lvl0>;
+				cooling-device =
+					<&CPU4 (THERMAL_MAX_LIMIT-5)
+						(THERMAL_MAX_LIMIT-5)>;
+			};
+		};
+	};
+
+	pmi632-bcl-lvl1 {
+		cooling-maps {
+			cpu0_cdev {
+				trip = <&bcl_lvl1>;
+				cooling-device =
+					<&CPU0 (THERMAL_MAX_LIMIT-4)
+						(THERMAL_MAX_LIMIT-4)>;
+			};
+
+			cpu4_cdev {
+				trip = <&bcl_lvl1>;
+				cooling-device =
+					<&CPU4 (THERMAL_MAX_LIMIT-4)
+						(THERMAL_MAX_LIMIT-4)>;
+			};
+
+			cpu6_cdev {
+				trip = <&bcl_lvl1>;
+				cooling-device = <&cpu6_isolate 1 1>;
+			};
+
+			cpu7_cdev {
+				trip = <&bcl_lvl1>;
+				cooling-device = <&cpu7_isolate 1 1>;
+			};
+		};
+	};
+
+	pmi632-bcl-lvl2 {
+		cooling-maps {
+			cpu4_cdev {
+				trip = <&bcl_lvl2>;
+				cooling-device = <&cpu4_isolate 1 1>;
+			};
+
+			cpu5_cdev {
+				trip = <&bcl_lvl2>;
+				cooling-device = <&cpu5_isolate 1 1>;
+			};
+		};
+	};
+
+	soc {
+		cooling-maps {
+			soc_cpu0 {
+				trip = <&pmi632_low_soc>;
+				cooling-device =
+					<&CPU0 (THERMAL_MAX_LIMIT-4)
+						(THERMAL_MAX_LIMIT-4)>;
+			};
+
+			soc_cpu4 {
+				trip = <&pmi632_low_soc>;
+				cooling-device =
+					<&CPU4 (THERMAL_MAX_LIMIT-4)
+						(THERMAL_MAX_LIMIT-4)>;
+			};
+
+			soc_cpu6 {
+				trip = <&pmi632_low_soc>;
+				cooling-device = <&cpu6_isolate 1 1>;
+			};
+
+			soc_cpu7 {
+				trip = <&pmi632_low_soc>;
+				cooling-device = <&cpu7_isolate 1 1>;
+			};
+		};
+	};
+};
diff --git a/qcom/bengal-thermal.dtsi b/qcom/bengal-thermal.dtsi
index a2525d63..c31b9c65 100644
--- a/qcom/bengal-thermal.dtsi
+++ b/qcom/bengal-thermal.dtsi
@@ -568,7 +568,6 @@
 		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-governor = "user_space";
-		thermal-sensors = <&pmi632_adc_tm ADC_GPIO2_PU2>;
 		wake-capable-sensor;
 		trips {
 			active-config0 {
@@ -1232,22 +1231,18 @@
 
 			batt_cdev1 {
 				trip = <&skin_batt_trip0>;
-				cooling-device = <&pmi632_charger 2 2>;
 			};
 
 			batt_cdev2 {
 				trip = <&skin_batt_trip1>;
-				cooling-device = <&pmi632_charger 4 4>;
 			};
 
 			batt_cdev3 {
 				trip = <&skin_batt_trip2>;
-				cooling-device = <&pmi632_charger 6 6>;
 			};
 
 			batt_cdev4 {
 				trip = <&skin_batt_trip3>;
-				cooling-device = <&pmi632_charger 7 7>;
 			};
 		};
 	};
diff --git a/qcom/bengal.dtsi b/qcom/bengal.dtsi
index b9794230..519586ab 100644
--- a/qcom/bengal.dtsi
+++ b/qcom/bengal.dtsi
@@ -2652,7 +2652,6 @@
 #include "bengal-coresight.dtsi"
 #include "bengal-bus.dtsi"
 #include "bengal-vidc.dtsi"
-#include "pmi632.dtsi"
 #include "pm6125.dtsi"
 
 &gcc_camss_top_gdsc {
@@ -2888,59 +2887,6 @@
 	};
 };
 
-&pmi632_vadc {
-	#address-cells = <1>;
-	#size-cells = <0>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&conn_therm_default &skin_therm_default>;
-
-	conn_therm {
-		reg = <ADC_GPIO1_PU2>;
-		label = "conn_therm";
-		qcom,ratiometric;
-		qcom,hw-settle-time = <200>;
-		qcom,pre-scaling = <1 1>;
-	};
-
-	skin_therm {
-		reg = <ADC_GPIO2_PU2>;
-		label = "skin_therm";
-		qcom,ratiometric;
-		qcom,hw-settle-time = <200>;
-		qcom,pre-scaling = <1 1>;
-	};
-};
-
-&pmi632_gpios {
-	conn_therm {
-		conn_therm_default: conn_therm_default {
-			pins = "gpio1";
-			bias-high-impedance;
-		};
-	};
-
-	skin_therm {
-		skin_therm_default: skin_therm_default {
-			pins = "gpio3";
-			bias-high-impedance;
-		};
-	};
-
-};
-
-&pmi632_adc_tm {
-	#address-cells = <1>;
-	#size-cells = <0>;
-	io-channels = <&pmi632_vadc ADC_GPIO2_PU2>;
-
-	/* Channel nodes */
-	skin_therm {
-		reg = <ADC_GPIO2_PU2>;
-		qcom,ratiometric;
-		qcom,hw-settle-time = <200>;
-	};
-};
-
 &msm_vidc {
 	qcom,cx-ipeak-data = <&cx_ipeak_lm 6>;
 	qcom,clock-freq-threshold = <300000000>;
diff --git a/qcom/bengalp-idp-overlay.dts b/qcom/bengalp-idp-overlay.dts
index d8ba915b..b01175e8 100644
--- a/qcom/bengalp-idp-overlay.dts
+++ b/qcom/bengalp-idp-overlay.dts
@@ -3,6 +3,7 @@
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include "bengal-idp.dtsi"
+#include "bengal-idp-pmi632.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. BENGALP IDP";
diff --git a/qcom/bengalp-idp.dts b/qcom/bengalp-idp.dts
index 578d7158..db8a15bd 100644
--- a/qcom/bengalp-idp.dts
+++ b/qcom/bengalp-idp.dts
@@ -2,6 +2,7 @@
 
 #include "bengalp.dtsi"
 #include "bengal-idp.dtsi"
+#include "bengal-idp-pmi632.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. BENGALP IDP";
diff --git a/qcom/bengalp-iot-idp.dtsi b/qcom/bengalp-iot-idp.dtsi
index eef3e49b..f0456538 100644
--- a/qcom/bengalp-iot-idp.dtsi
+++ b/qcom/bengalp-iot-idp.dtsi
@@ -1 +1,2 @@
 #include "bengal-idp.dtsi"
+#include "bengal-idp-pmi632.dtsi"
diff --git a/qcom/bengalp-iot.dtsi b/qcom/bengalp-iot.dtsi
index 165af6ac..8a9fa898 100644
--- a/qcom/bengalp-iot.dtsi
+++ b/qcom/bengalp-iot.dtsi
@@ -1,4 +1,5 @@
 #include "bengal.dtsi"
+#include "bengal-pmi632.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. BENGALP-IOT";