diff --git a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
index 0da29207e..5b237f08a 100644
--- a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
@@ -69,6 +69,7 @@
 			clock-latency = <50000>;
 			capacity-dmips-mhz = <632>;
 			dynamic-power-coefficient = <110>;
+			#cooling-cells = <2>;
 		};
 
 		CPU1:cpu@1 {
@@ -109,6 +110,7 @@
 			clock-latency = <50000>;
 			capacity-dmips-mhz = <1024>;
 			dynamic-power-coefficient = <550>;
+			#cooling-cells = <2>;
 		};
 
 		CPU3:cpu@101 {
@@ -544,37 +546,31 @@
 
 	p_tsensor: p_tsensor@ff634594 {
 		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-pthermal";
-		status = "disabled";
+		status = "okay";
 		reg = <0x0 0xff634800 0x0 0x50>,
 			<0x0 0xff800268 0x0 0x4>;
+		tsensor_id = <1>;
 		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
+		cal_coeff = <324 424 3159 9411>;
 		rtemp = <115000>;
-		interrupts = <0 35 0>;
-		//clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		//clock-names = "ts_comp";
+		interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&clkc CLKID_TS>; /* CLKID_TS_COMP>;*/
+		clock-names = "ts_comp";
 		#thermal-sensor-cells = <1>;
 	};
 
 	d_tsensor: d_tsensor@ff800228 {
 		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-dthermal";
-		status = "disabled";
+		status = "okay";
 		reg = <0x0 0xff634c00 0x0 0x50>,
 			<0x0 0xff800230 0x0 0x4>;
+		tsensor_id = <2>;
 		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
+		cal_coeff = <324 424 3159 9411>;
 		rtemp = <115000>;
-		interrupts = <0 36 0>;
-		//clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		//clock-names = "ts_comp";
+		interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&clkc CLKID_TS>; /* CLKID_TS_COMP>;*/
+		clock-names = "ts_comp";
 		#thermal-sensor-cells = <1>;
 	};
 
@@ -1550,49 +1546,33 @@
 	};
 
 	meson_cooldev: meson-cooldev@0 {
-			status = "disabled";
+			status = "okay";
 			compatible = "amlogic, meson-cooldev";
-			device_name = "mcooldev";
 			cooling_devices {
-				cpufreq_cool_cluster0 {
-					min_state = <1000000>;
-					dyn_coeff = <120>;
+				cpucore_cool_cluster0 {
 					cluster_id = <0>;
-					node_name = "cpufreq_cool0";
-					device_type = "cpufreq";
+					node_name = "cpucore_cool0";
+					device_type = "cpucore";
 				};
-				cpufreq_cool_cluster1 {
-					min_state = <1000000>;
-					dyn_coeff = <460>;
+				cpucore_cool_cluster1 {
 					cluster_id = <1>;
-					node_name = "cpufreq_cool1";
-					device_type = "cpufreq";
-				};
-				cpucore_cool_cluster {
-					min_state = <1>;
-					node_name = "cpucore_cool";
+					node_name = "cpucore_cool1";
 					device_type = "cpucore";
 				};
 				gpufreq_cool {
-					min_state = <400>;
 					dyn_coeff = <358>;
-					gpu_pp = <2>;
 					node_name = "gpufreq_cool0";
 					device_type = "gpufreq";
 				};
 				gpucore_cool {
-					min_state = <1>;
 					node_name = "gpucore_cool0";
 					device_type = "gpucore";
 				};
 			};
-			cpufreq_cool0:cpufreq_cool0 {
+			cpucore_cool0:cpucore_cool0 {
 				#cooling-cells = <2>; /* min followed by max */
 			};
-			cpufreq_cool1:cpufreq_cool1 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			cpucore_cool:cpucore_cool {
+			cpucore_cool1:cpucore_cool1 {
 				#cooling-cells = <2>; /* min followed by max */
 			};
 			gpufreq_cool0:gpufreq_cool0 {
@@ -1604,7 +1584,7 @@
 	};/*meson cooling devices end*/
 
 	thermal-zones {
-		status = "disabled";
+		status = "okays";
 		soc_thermal: soc_thermal {
 			polling-delay = <1000>;
 			polling-delay-passive = <100>;
@@ -1636,19 +1616,17 @@
 			cooling-maps {
 				cpufreq_cooling_map0 {
 					trip = <&pcontrol>;
-					cooling-device = <&cpufreq_cool0 0
-							  THERMAL_NO_LIMIT>;
+					cooling-device = <&CPU0 0 THERMAL_NO_LIMIT>;
 					contribution = <1024>;
 				};
 				cpufreq_cooling_map1 {
 					trip = <&pcontrol>;
-					cooling-device = <&cpufreq_cool1 0
-							  THERMAL_NO_LIMIT>;
+					cooling-device = <&CPU2 0 THERMAL_NO_LIMIT>;
 					contribution = <1024>;
 				};
 				cpucore_cooling_map0 {
 					trip = <&pcontrol>;
-					cooling-device = <&cpucore_cool 0
+					cooling-device = <&cpucore_cool0 0
 							  THERMAL_NO_LIMIT>;
 					contribution = <1024>;
 				};