diff --git a/qcom/pineapple-pmic-overlay.dtsi b/qcom/pineapple-pmic-overlay.dtsi
index dbbea970..f37e7492 100644
--- a/qcom/pineapple-pmic-overlay.dtsi
+++ b/qcom/pineapple-pmic-overlay.dtsi
@@ -92,27 +92,27 @@
 };
 
 &pm8550vs_c_tz {
-	io-channels = <&pmk8550_vadc PM8550VS_C_ADC5_GEN3_DIE_TEMP>;
+	io-channels = <&pmk8550_vadc PM8550VX_ADC5_GEN3_DIE_TEMP(2)>;
 	io-channel-names = "thermal";
 };
 
 &pm8550vs_d_tz {
-	io-channels = <&pmk8550_vadc PM8550VS_D_ADC5_GEN3_DIE_TEMP>;
+	io-channels = <&pmk8550_vadc PM8550VX_ADC5_GEN3_DIE_TEMP(3)>;
 	io-channel-names = "thermal";
 };
 
 &pm8550vs_e_tz {
-	io-channels = <&pmk8550_vadc PM8550VS_E_ADC5_GEN3_DIE_TEMP>;
+	io-channels = <&pmk8550_vadc PM8550VX_ADC5_GEN3_DIE_TEMP(4)>;
 	io-channel-names = "thermal";
 };
 
 &pm8550vs_g_tz {
-	io-channels = <&pmk8550_vadc PM8550VS_G_ADC5_GEN3_DIE_TEMP>;
+	io-channels = <&pmk8550_vadc PM8550VX_ADC5_GEN3_DIE_TEMP(6)>;
 	io-channel-names = "thermal";
 };
 
 &pm8550ve_i_tz {
-	io-channels = <&pmk8550_vadc PM8550VE_ADC5_GEN3_DIE_TEMP>;
+	io-channels = <&pmk8550_vadc PM8550VX_ADC5_GEN3_DIE_TEMP(8)>;
 	io-channel-names = "thermal";
 };
 
@@ -240,31 +240,31 @@
 	};
 
 	pm8550vs_c_die_temp {
-		reg = <PM8550VS_C_ADC5_GEN3_DIE_TEMP>;
+		reg = <PM8550VX_ADC5_GEN3_DIE_TEMP(2)>;
 		label = "pm8550vs_c_die_temp";
 		qcom,pre-scaling = <1 1>;
 	};
 
 	pm8550vs_d_die_temp {
-		reg = <PM8550VS_D_ADC5_GEN3_DIE_TEMP>;
+		reg = <PM8550VX_ADC5_GEN3_DIE_TEMP(3)>;
 		label = "pm8550vs_d_die_temp";
 		qcom,pre-scaling = <1 1>;
 	};
 
 	pm8550vs_e_die_temp {
-		reg = <PM8550VS_E_ADC5_GEN3_DIE_TEMP>;
+		reg = <PM8550VX_ADC5_GEN3_DIE_TEMP(4)>;
 		label = "pm8550vs_e_die_temp";
 		qcom,pre-scaling = <1 1>;
 	};
 
 	pm8550vs_g_die_temp {
-		reg = <PM8550VS_G_ADC5_GEN3_DIE_TEMP>;
+		reg = <PM8550VX_ADC5_GEN3_DIE_TEMP(6)>;
 		label = "pm8550vs_g_die_temp";
 		qcom,pre-scaling = <1 1>;
 	};
 
 	pm8550ve_die_temp {
-		reg = <PM8550VE_ADC5_GEN3_DIE_TEMP>;
+		reg = <PM8550VX_ADC5_GEN3_DIE_TEMP(8)>;
 		label = "pm8550ve_die_temp";
 		qcom,pre-scaling = <1 1>;
 	};
diff --git a/qcom/pmk8550.dtsi b/qcom/pmk8550.dtsi
index af7c5976..82c4cb1d 100644
--- a/qcom/pmk8550.dtsi
+++ b/qcom/pmk8550.dtsi
@@ -9,7 +9,6 @@
 #include <dt-bindings/iio/qcom,spmi-adc5-gen3-pmk8550.h>
 #include <dt-bindings/iio/qcom,spmi-adc5-gen3-pm8550.h>
 #include <dt-bindings/iio/qcom,spmi-adc5-gen3-pm8550b.h>
-#define PM8550VE_SID	8
 #include <dt-bindings/iio/qcom,spmi-adc5-gen3-pm8550vx.h>
 
 &spmi_bus {
diff --git a/qcom/sun-pmic-overlay.dtsi b/qcom/sun-pmic-overlay.dtsi
index 114aebe2..9f38df7e 100644
--- a/qcom/sun-pmic-overlay.dtsi
+++ b/qcom/sun-pmic-overlay.dtsi
@@ -108,3 +108,236 @@
 		enable-active-high;
 	};
 };
+
+&pm8550_tz {
+	io-channels = <&pmk8550_vadc PM8550_ADC5_GEN3_DIE_TEMP>;
+	io-channel-names = "thermal";
+};
+
+&pm8550vs_f_tz {
+	io-channels = <&pmk8550_vadc PM8550VX_ADC5_GEN3_DIE_TEMP(5)>;
+	io-channel-names = "thermal";
+};
+
+&pm8550vs_j_tz {
+	io-channels = <&pmk8550_vadc PM8550VX_ADC5_GEN3_DIE_TEMP(9)>;
+	io-channel-names = "thermal";
+};
+
+&pm8550ve_d_tz {
+	io-channels = <&pmk8550_vadc PM8550VX_ADC5_GEN3_DIE_TEMP(3)>;
+	io-channel-names = "thermal";
+};
+
+&pm8550ve_g_tz {
+	io-channels = <&pmk8550_vadc PM8550VX_ADC5_GEN3_DIE_TEMP(6)>;
+	io-channel-names = "thermal";
+};
+
+&pm8550ve_i_tz {
+	io-channels = <&pmk8550_vadc PM8550VX_ADC5_GEN3_DIE_TEMP(8)>;
+	io-channel-names = "thermal";
+};
+
+&pmk8550_vadc {
+	pm8550_skin_therm {
+		reg = <PM8550_ADC5_GEN3_AMUX_THM1_100K_PU>;
+		label = "pm8550_skin_therm";
+		qcom,ratiometric;
+		qcom,hw-settle-time = <200>;
+		qcom,pre-scaling = <1 1>;
+		qcom,adc-tm-type = <1>;
+	};
+
+	pm8550_cam_flash_therm {
+		reg = <PM8550_ADC5_GEN3_AMUX_THM2_100K_PU>;
+		label = "pm8550_cam_flash_therm";
+		qcom,ratiometric;
+		qcom,hw-settle-time = <200>;
+		qcom,pre-scaling = <1 1>;
+		qcom,adc-tm-type = <1>;
+	};
+
+	pm8550_wlan_therm {
+		reg = <PM8550_ADC5_GEN3_AMUX_THM3_100K_PU>;
+		label = "pm8550_wlan_therm";
+		qcom,ratiometric;
+		qcom,hw-settle-time = <200>;
+		qcom,pre-scaling = <1 1>;
+		qcom,adc-tm-type = <1>;
+	};
+
+	pm8550_pa_therm1 {
+		reg = <PM8550_ADC5_GEN3_AMUX_THM4_100K_PU>;
+		label = "pm8550_pa_therm_1";
+		qcom,ratiometric;
+		qcom,hw-settle-time = <200>;
+		qcom,pre-scaling = <1 1>;
+		qcom,adc-tm-type = <1>;
+	};
+
+	pm8550_rear_tof_therm {
+		reg = <PM8550_ADC5_GEN3_AMUX_THM5_100K_PU>;
+		label = "pm8550_rear_tof_therm";
+		qcom,ratiometric;
+		qcom,hw-settle-time = <200>;
+		qcom,pre-scaling = <1 1>;
+		qcom,adc-tm-type = <1>;
+	};
+
+	pmk8550_xo_therm {
+		reg = <PMK8550_ADC5_GEN3_AMUX_THM1_XO_THERM_100K_PU>;
+		label = "pmk8550_xo_therm";
+		qcom,ratiometric;
+		qcom,hw-settle-time = <200>;
+		qcom,pre-scaling = <1 1>;
+		qcom,adc-tm-type = <1>;
+	};
+
+	pm8550vs_f_die_temp {
+		reg = <PM8550VX_ADC5_GEN3_DIE_TEMP(5)>;
+		label = "pm8550vs_f_die_temp";
+		qcom,pre-scaling = <1 1>;
+	};
+
+	pm8550vs_j_die_temp {
+		reg = <PM8550VX_ADC5_GEN3_DIE_TEMP(9)>;
+		label = "pm8550vs_j_die_temp";
+		qcom,pre-scaling = <1 1>;
+	};
+
+	pm8550ve_d_die_temp {
+		reg = <PM8550VX_ADC5_GEN3_DIE_TEMP(3)>;
+		label = "pm8550ve_d_die_temp";
+		qcom,pre-scaling = <1 1>;
+	};
+
+	pm8550ve_g_die_temp {
+		reg = <PM8550VX_ADC5_GEN3_DIE_TEMP(6)>;
+		label = "pm8550ve_g_die_temp";
+		qom,pre-scaling = <1 1>;
+	};
+
+	pm8550ve_i_die_temp {
+		reg = <PM8550VX_ADC5_GEN3_DIE_TEMP(8)>;
+		label = "pm8550ve_i_die_temp";
+		qcom,pre-scaling = <1 1>;
+	};
+};
+
+&thermal_zones {
+	sys-therm1 {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-sensors = <&pmk8550_vadc PM8550_ADC5_GEN3_AMUX_THM1_100K_PU>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			active-config1 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+		};
+	};
+
+	sys-therm2 {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-sensors = <&pmk8550_vadc PM8550_ADC5_GEN3_AMUX_THM2_100K_PU>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			active-config1 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+		};
+	};
+
+	sys-therm3 {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-sensors = <&pmk8550_vadc PM8550_ADC5_GEN3_AMUX_THM3_100K_PU>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			active-config1 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+		};
+	};
+
+	sys-therm4 {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-sensors = <&pmk8550_vadc PM8550_ADC5_GEN3_AMUX_THM4_100K_PU>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			active-config1 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+		};
+	};
+
+	sys-therm5 {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-sensors = <&pmk8550_vadc PM8550_ADC5_GEN3_AMUX_THM5_100K_PU>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			active-config1 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+		};
+	};
+
+	sys-therm6 {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-sensors = <&pmk8550_vadc PMK8550_ADC5_GEN3_AMUX_THM1_XO_THERM_100K_PU>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			active-config1 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+		};
+	};
+};