diff --git a/arch/arm/boot/dts/amlogic/mesonsm1.dtsi b/arch/arm/boot/dts/amlogic/mesonsm1.dtsi
index 112d13c561f3..e20ebd14f9b0 100644
--- a/arch/arm/boot/dts/amlogic/mesonsm1.dtsi
+++ b/arch/arm/boot/dts/amlogic/mesonsm1.dtsi
@@ -1732,6 +1732,175 @@
 	cpu_ver_name {
 		compatible = "amlogic, cpu-major-id-sm1";
 	};
+
+	p_tsensor: p_tsensor@ff634800 {
+		compatible = "amlogic, r1p1-tsensor";
+		device_name = "meson-pthermal";
+		status = "okay";
+		reg = <0xff634800 0x50>,
+			<0xff800268 0x4>;
+		cal_type = <0x1>;
+		cal_a = <324>;
+		cal_b = <424>;
+		cal_c = <3159>;
+		cal_d = <9411>;
+		rtemp = <115000>;
+		interrupts = <0 35 0>;
+		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
+		clock-names = "ts_comp";
+		#thermal-sensor-cells = <1>;
+		};
+
+	d_tsensor: d_tsensor@ff634c00 {
+		compatible = "amlogic, r1p1-tsensor";
+		device_name = "meson-dthermal";
+		status = "okay";
+		reg = <0xff634c00 0x50>,
+			<0xff800230 0x4>;
+		cal_type = <0x1>;
+		cal_a = <324>;
+		cal_b = <424>;
+		cal_c = <3159>;
+		cal_d = <9411>;
+		rtemp = <115000>;
+		interrupts = <0 36 0>;
+		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
+		clock-names = "ts_comp";
+		#thermal-sensor-cells = <1>;
+	};
+	meson_cooldev: meson-cooldev@0 {
+			status = "okay";
+			compatible = "amlogic, meson-cooldev";
+			device_name = "mcooldev";
+			cooling_devices {
+				cpufreq_cool_cluster0 {
+					min_state = <1000000>;
+					dyn_coeff = <125>;
+					gpu_pp = <2>;
+					cluster_id = <0>;
+					node_name = "cpufreq_cool0";
+					device_type = "cpufreq";
+				};
+				cpucore_cool_cluster0 {
+					min_state = <1>;
+					dyn_coeff = <0>;
+					gpu_pp = <2>;
+					cluster_id = <0>;
+					node_name = "cpucore_cool0";
+					device_type = "cpucore";
+				};
+				gpufreq_cool {
+					min_state = <400>;
+					dyn_coeff = <215>;
+					gpu_pp = <2>;
+					cluster_id = <0>;
+					node_name = "gpufreq_cool0";
+					device_type = "gpufreq";
+				};
+				gpucore_cool {
+					min_state = <1>;
+					dyn_coeff = <0>;
+					gpu_pp = <2>;
+					cluster_id = <0>;
+					node_name = "gpucore_cool0";
+					device_type = "gpucore";
+				};
+			};
+			cpufreq_cool0:cpufreq_cool0 {
+				#cooling-cells = <2>; /* min followed by max */
+			};
+			cpucore_cool0:cpucore_cool0 {
+				#cooling-cells = <2>; /* min followed by max */
+			};
+			gpufreq_cool0:gpufreq_cool0 {
+				#cooling-cells = <2>; /* min followed by max */
+			};
+			gpucore_cool0:gpucore_cool0 {
+				#cooling-cells = <2>; /* min followed by max */
+			};
+		};/*meson cooling devices end*/
+
+	thermal-zones {
+		soc_thermal: soc_thermal {
+			polling-delay = <1000>;
+			polling-delay-passive = <100>;
+			sustainable-power = <1410>;
+			thermal-sensors = <&p_tsensor 0>;
+			trips {
+				pswitch_on: trip-point@0 {
+					temperature = <60000>;
+					hysteresis = <5000>;
+					type = "passive";
+				};
+				pcontrol: trip-point@1 {
+					temperature = <75000>;
+					hysteresis = <5000>;
+					type = "passive";
+				};
+				phot: trip-point@2 {
+					temperature = <85000>;
+					hysteresis = <5000>;
+					type = "hot";
+				};
+				pcritical: trip-point@3 {
+					temperature = <110000>;
+					hysteresis = <1000>;
+					type = "critical";
+				};
+			};
+
+			cooling-maps {
+				cpufreq_cooling_map {
+					trip = <&pcontrol>;
+					cooling-device = <&cpufreq_cool0 0 4>;
+					contribution = <1024>;
+				};
+				cpucore_cooling_map {
+					trip = <&pcontrol>;
+					cooling-device = <&cpucore_cool0 0 3>;
+					contribution = <1024>;
+				};
+				gpufreq_cooling_map {
+					trip = <&pcontrol>;
+					cooling-device = <&gpufreq_cool0 0 3>;
+					contribution = <1024>;
+				};
+				gpucore_cooling_map {
+					trip = <&pcontrol>;
+					cooling-device = <&gpucore_cool0 0 2>;
+					contribution = <1024>;
+				};
+			};
+		};
+		ddr_thermal: ddr_thermal {
+			polling-delay = <2000>;
+			polling-delay-passive = <1000>;
+			sustainable-power = <1410>;
+			thermal-sensors = <&d_tsensor 1>;
+			trips {
+				dswitch_on: trip-point@0 {
+					temperature = <60000>;
+					hysteresis = <5000>;
+					type = "passive";
+				};
+				dcontrol: trip-point@1 {
+					temperature = <75000>;
+					hysteresis = <5000>;
+					type = "passive";
+				};
+				dhot: trip-point@2 {
+					temperature = <85000>;
+					hysteresis = <5000>;
+					type = "hot";
+				};
+				dcritical: trip-point@3 {
+					temperature = <110000>;
+					hysteresis = <1000>;
+					type = "critical";
+				};
+			};
+		};
+	};/*thermal zone end*/
 };/* end of / */
 
 &pinctrl_aobus {
diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts
index 735c384c76dc..46cc87aceab0 100644
--- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts
@@ -813,176 +813,6 @@
 		tuner_xtal_cap = <30>; /* when tuner_xtal_mode = 1, set 25 */
 	};
 
-	p_tsensor: p_tsensor@ff634800 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-pthermal";
-		status = "okay";
-		reg = <0xff634800 0x50>,
-			<0xff800268 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 35 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	d_tsensor: d_tsensor@ff634c00 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-dthermal";
-		status = "okay";
-		reg = <0xff634c00 0x50>,
-			<0xff800230 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 36 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	meson_cooldev: meson-cooldev@0 {
-			status = "okay";
-			compatible = "amlogic, meson-cooldev";
-			device_name = "mcooldev";
-			cooling_devices {
-				cpufreq_cool_cluster0 {
-					min_state = <1000000>;
-					dyn_coeff = <125>;
-					cluster_id = <0>;
-					node_name = "cpufreq_cool0";
-					device_type = "cpufreq";
-				};
-				cpucore_cool_cluster0 {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "cpucore_cool0";
-					device_type = "cpucore";
-				};
-				gpufreq_cool {
-					min_state = <400>;
-					dyn_coeff = <215>;
-					gpu_pp = <2>;
-					cluster_id = <0>;
-					node_name = "gpufreq_cool0";
-					device_type = "gpufreq";
-				};
-				gpucore_cool {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "gpucore_cool0";
-					device_type = "gpucore";
-				};
-			};
-			cpufreq_cool0:cpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			cpucore_cool0:cpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpufreq_cool0:gpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpucore_cool0:gpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-		};
-		/*meson cooling devices end*/
-
-	thermal-zones {
-		soc_thermal: soc_thermal {
-			polling-delay = <1000>;
-			polling-delay-passive = <100>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&p_tsensor 0>;
-			trips {
-				pswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				pcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				phot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				pcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-			cooling-maps {
-				cpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				cpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpucore_cool0 0 3>;
-					contribution = <1024>;
-				};
-				gpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				gpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpucore_cool0 0 2>;
-					contribution = <1024>;
-				};
-			};
-		};
-		ddr_thermal: ddr_thermal {
-			polling-delay = <2000>;
-			polling-delay-passive = <1000>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&d_tsensor 1>;
-			trips {
-				dswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dhot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				dcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-		};
-	};
-	/*thermal zone end*/
-
 	cpu_opp_table0: cpu_opp_table0 {
 		compatible = "operating-points-v2";
 		opp-shared;
diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200_buildroot.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200_buildroot.dts
index 4570137858e6..eb8e4b3cc6fb 100644
--- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200_buildroot.dts
@@ -886,176 +886,6 @@
 		tuner_xtal_cap = <30>; /* when tuner_xtal_mode = 1, set 25 */
 	};
 
-	p_tsensor: p_tsensor@ff634800 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-pthermal";
-		status = "okay";
-		reg = <0xff634800 0x50>,
-			<0xff800268 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 35 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	d_tsensor: d_tsensor@ff634c00 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-dthermal";
-		status = "okay";
-		reg = <0xff634c00 0x50>,
-			<0xff800230 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 36 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	meson_cooldev: meson-cooldev@0 {
-			status = "okay";
-			compatible = "amlogic, meson-cooldev";
-			device_name = "mcooldev";
-			cooling_devices {
-				cpufreq_cool_cluster0 {
-					min_state = <1000000>;
-					dyn_coeff = <125>;
-					cluster_id = <0>;
-					node_name = "cpufreq_cool0";
-					device_type = "cpufreq";
-				};
-				cpucore_cool_cluster0 {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "cpucore_cool0";
-					device_type = "cpucore";
-				};
-				gpufreq_cool {
-					min_state = <400>;
-					dyn_coeff = <215>;
-					gpu_pp = <2>;
-					cluster_id = <0>;
-					node_name = "gpufreq_cool0";
-					device_type = "gpufreq";
-				};
-				gpucore_cool {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "gpucore_cool0";
-					device_type = "gpucore";
-				};
-			};
-			cpufreq_cool0:cpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			cpucore_cool0:cpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpufreq_cool0:gpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpucore_cool0:gpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-		};
-		/*meson cooling devices end*/
-
-	thermal-zones {
-		soc_thermal: soc_thermal {
-			polling-delay = <1000>;
-			polling-delay-passive = <100>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&p_tsensor 0>;
-			trips {
-				pswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				pcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				phot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				pcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-			cooling-maps {
-				cpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				cpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpucore_cool0 0 3>;
-					contribution = <1024>;
-				};
-				gpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				gpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpucore_cool0 0 2>;
-					contribution = <1024>;
-				};
-			};
-		};
-		ddr_thermal: ddr_thermal {
-			polling-delay = <2000>;
-			polling-delay-passive = <1000>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&d_tsensor 1>;
-			trips {
-				dswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dhot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				dcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-		};
-	};
-	/*thermal zone end*/
-
 	cpu_opp_table0: cpu_opp_table0 {
 		compatible = "operating-points-v2";
 		opp-shared;
diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200_drm_buildroot.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200_drm_buildroot.dts
index 0211ea01f9a2..a3e044c9e4a1 100644
--- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200_drm_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200_drm_buildroot.dts
@@ -887,176 +887,6 @@
 		tuner_xtal_cap = <30>; /* when tuner_xtal_mode = 1, set 25 */
 	};
 
-	p_tsensor: p_tsensor@ff634800 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-pthermal";
-		status = "okay";
-		reg = <0xff634800 0x50>,
-			<0xff800268 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 35 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	d_tsensor: d_tsensor@ff634c00 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-dthermal";
-		status = "okay";
-		reg = <0xff634c00 0x50>,
-			<0xff800230 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 36 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	meson_cooldev: meson-cooldev@0 {
-			status = "okay";
-			compatible = "amlogic, meson-cooldev";
-			device_name = "mcooldev";
-			cooling_devices {
-				cpufreq_cool_cluster0 {
-					min_state = <1000000>;
-					dyn_coeff = <125>;
-					cluster_id = <0>;
-					node_name = "cpufreq_cool0";
-					device_type = "cpufreq";
-				};
-				cpucore_cool_cluster0 {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "cpucore_cool0";
-					device_type = "cpucore";
-				};
-				gpufreq_cool {
-					min_state = <400>;
-					dyn_coeff = <215>;
-					gpu_pp = <2>;
-					cluster_id = <0>;
-					node_name = "gpufreq_cool0";
-					device_type = "gpufreq";
-				};
-				gpucore_cool {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "gpucore_cool0";
-					device_type = "gpucore";
-				};
-			};
-			cpufreq_cool0:cpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			cpucore_cool0:cpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpufreq_cool0:gpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpucore_cool0:gpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-		};
-		/*meson cooling devices end*/
-
-	thermal-zones {
-		soc_thermal: soc_thermal {
-			polling-delay = <1000>;
-			polling-delay-passive = <100>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&p_tsensor 0>;
-			trips {
-				pswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				pcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				phot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				pcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-			cooling-maps {
-				cpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				cpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpucore_cool0 0 3>;
-					contribution = <1024>;
-				};
-				gpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				gpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpucore_cool0 0 2>;
-					contribution = <1024>;
-				};
-			};
-		};
-		ddr_thermal: ddr_thermal {
-			polling-delay = <2000>;
-			polling-delay-passive = <1000>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&d_tsensor 1>;
-			trips {
-				dswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dhot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				dcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-		};
-	};
-	/*thermal zone end*/
-
 	cpu_opp_table0: cpu_opp_table0 {
 		compatible = "operating-points-v2";
 		opp-shared;
diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts
index 6341279615d2..698bfcb80954 100644
--- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts
@@ -829,175 +829,6 @@
 		tuner_xtal_cap = <30>; /* when tuner_xtal_mode = 1, set 25 */
 	};
 
-	p_tsensor: p_tsensor@ff634800 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-pthermal";
-		status = "okay";
-		reg = <0xff634800 0x50>,
-			<0xff800268 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 35 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	d_tsensor: d_tsensor@ff634c00 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-dthermal";
-		status = "okay";
-		reg = <0xff634c00 0x50>,
-			<0xff800230 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 36 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	meson_cooldev: meson-cooldev@0 {
-			status = "okay";
-			compatible = "amlogic, meson-cooldev";
-			device_name = "mcooldev";
-			cooling_devices {
-				cpufreq_cool_cluster0 {
-					min_state = <1000000>;
-					dyn_coeff = <125>;
-					cluster_id = <0>;
-					node_name = "cpufreq_cool0";
-					device_type = "cpufreq";
-				};
-				cpucore_cool_cluster0 {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "cpucore_cool0";
-					device_type = "cpucore";
-				};
-				gpufreq_cool {
-					min_state = <400>;
-					dyn_coeff = <215>;
-					gpu_pp = <2>;
-					cluster_id = <0>;
-					node_name = "gpufreq_cool0";
-					device_type = "gpufreq";
-				};
-				gpucore_cool {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "gpucore_cool0";
-					device_type = "gpucore";
-				};
-			};
-			cpufreq_cool0:cpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			cpucore_cool0:cpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpufreq_cool0:gpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpucore_cool0:gpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-		};
-		/*meson cooling devices end*/
-
-	thermal-zones {
-		soc_thermal: soc_thermal {
-			polling-delay = <1000>;
-			polling-delay-passive = <100>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&p_tsensor 0>;
-			trips {
-				pswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				pcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				phot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				pcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-			cooling-maps {
-				cpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				cpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpucore_cool0 0 3>;
-					contribution = <1024>;
-				};
-				gpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				gpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpucore_cool0 0 2>;
-					contribution = <1024>;
-				};
-			};
-		};
-		ddr_thermal: ddr_thermal {
-			polling-delay = <2000>;
-			polling-delay-passive = <1000>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&d_tsensor 1>;
-			trips {
-				dswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dhot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				dcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-		};
-	};
-	/*thermal zone end*/
 
 	cpu_opp_table0: cpu_opp_table0 {
 		compatible = "operating-points-v2";
diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
index 624e78325193..62c76da4182f 100644
--- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
@@ -829,176 +829,6 @@
 		tuner_xtal_cap = <30>; /* when tuner_xtal_mode = 1, set 25 */
 	};
 
-	p_tsensor: p_tsensor@ff634800 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-pthermal";
-		status = "okay";
-		reg = <0xff634800 0x50>,
-			<0xff800268 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 35 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	d_tsensor: d_tsensor@ff634c00 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-dthermal";
-		status = "okay";
-		reg = <0xff634c00 0x50>,
-			<0xff800230 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 36 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	meson_cooldev: meson-cooldev@0 {
-			status = "okay";
-			compatible = "amlogic, meson-cooldev";
-			device_name = "mcooldev";
-			cooling_devices {
-				cpufreq_cool_cluster0 {
-					min_state = <1000000>;
-					dyn_coeff = <125>;
-					cluster_id = <0>;
-					node_name = "cpufreq_cool0";
-					device_type = "cpufreq";
-				};
-				cpucore_cool_cluster0 {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "cpucore_cool0";
-					device_type = "cpucore";
-				};
-				gpufreq_cool {
-					min_state = <400>;
-					dyn_coeff = <215>;
-					gpu_pp = <2>;
-					cluster_id = <0>;
-					node_name = "gpufreq_cool0";
-					device_type = "gpufreq";
-				};
-				gpucore_cool {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "gpucore_cool0";
-					device_type = "gpucore";
-				};
-			};
-			cpufreq_cool0:cpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			cpucore_cool0:cpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpufreq_cool0:gpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpucore_cool0:gpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-		};
-		/*meson cooling devices end*/
-
-	thermal-zones {
-		soc_thermal: soc_thermal {
-			polling-delay = <1000>;
-			polling-delay-passive = <100>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&p_tsensor 0>;
-			trips {
-				pswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				pcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				phot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				pcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-			cooling-maps {
-				cpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				cpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpucore_cool0 0 3>;
-					contribution = <1024>;
-				};
-				gpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				gpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpucore_cool0 0 2>;
-					contribution = <1024>;
-				};
-			};
-		};
-		ddr_thermal: ddr_thermal {
-			polling-delay = <2000>;
-			polling-delay-passive = <1000>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&d_tsensor 1>;
-			trips {
-				dswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dhot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				dcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-		};
-	};
-	/*thermal zone end*/
-
 	cpu_opp_table0: cpu_opp_table0 {
 		compatible = "operating-points-v2";
 		opp-shared;
diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts
index 2642e482b8ae..2b627be20e57 100644
--- a/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts
@@ -817,175 +817,6 @@
 		tuner_xtal_cap = <30>; /* when tuner_xtal_mode = 1, set 25 */
 	};
 
-	p_tsensor: p_tsensor@ff634800 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-pthermal";
-		status = "okay";
-		reg = <0xff634800 0x50>,
-			<0xff800268 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 35 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	d_tsensor: d_tsensor@ff634c00 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-dthermal";
-		status = "okay";
-		reg = <0xff634c00 0x50>,
-			<0xff800230 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 36 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	meson_cooldev: meson-cooldev@0 {
-			status = "okay";
-			compatible = "amlogic, meson-cooldev";
-			device_name = "mcooldev";
-			cooling_devices {
-				cpufreq_cool_cluster0 {
-					min_state = <1000000>;
-					dyn_coeff = <125>;
-					cluster_id = <0>;
-					node_name = "cpufreq_cool0";
-					device_type = "cpufreq";
-				};
-				cpucore_cool_cluster0 {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "cpucore_cool0";
-					device_type = "cpucore";
-				};
-				gpufreq_cool {
-					min_state = <400>;
-					dyn_coeff = <215>;
-					gpu_pp = <2>;
-					cluster_id = <0>;
-					node_name = "gpufreq_cool0";
-					device_type = "gpufreq";
-				};
-				gpucore_cool {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "gpucore_cool0";
-					device_type = "gpucore";
-				};
-			};
-			cpufreq_cool0:cpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			cpucore_cool0:cpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpufreq_cool0:gpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpucore_cool0:gpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-		};
-		/*meson cooling devices end*/
-
-	thermal-zones {
-		soc_thermal: soc_thermal {
-			polling-delay = <1000>;
-			polling-delay-passive = <100>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&p_tsensor 0>;
-			trips {
-				pswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				pcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				phot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				pcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-			cooling-maps {
-				cpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				cpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpucore_cool0 0 3>;
-					contribution = <1024>;
-				};
-				gpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				gpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpucore_cool0 0 2>;
-					contribution = <1024>;
-				};
-			};
-		};
-		ddr_thermal: ddr_thermal {
-			polling-delay = <2000>;
-			polling-delay-passive = <1000>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&d_tsensor 1>;
-			trips {
-				dswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dhot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				dcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-		};
-	};
-	/*thermal zone end*/
 
 	cpu_opp_table0: cpu_opp_table0 {
 		compatible = "operating-points-v2";
diff --git a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts
index 7f7737ecd60a..c65327b70dd3 100644
--- a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts
@@ -750,175 +750,6 @@
 		status = "disabled";
 	};
 	/* Audio Related end */
-	p_tsensor: p_tsensor@ff634594 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-pthermal";
-		status = "okay";
-		reg = <0xff634800 0x50>,
-			<0xff800268 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 35 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* 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 = "okay";
-		reg = <0xff634c00 0x50>,
-			<0xff800230 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 36 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	meson_cooldev: meson-cooldev@0 {
-			status = "okay";
-			compatible = "amlogic, meson-cooldev";
-			device_name = "mcooldev";
-			cooling_devices {
-				cpufreq_cool_cluster0 {
-					min_state = <1000000>;
-					dyn_coeff = <125>;
-					cluster_id = <0>;
-					node_name = "cpufreq_cool0";
-					device_type = "cpufreq";
-				};
-				cpucore_cool_cluster0 {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "cpucore_cool0";
-					device_type = "cpucore";
-				};
-				gpufreq_cool {
-					min_state = <400>;
-					dyn_coeff = <215>;
-					gpu_pp = <2>;
-					cluster_id = <0>;
-					node_name = "gpufreq_cool0";
-					device_type = "gpufreq";
-				};
-				gpucore_cool {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "gpucore_cool0";
-					device_type = "gpucore";
-				};
-			};
-			cpufreq_cool0:cpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			cpucore_cool0:cpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpufreq_cool0:gpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpucore_cool0:gpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-		};
-		/*meson cooling devices end*/
-
-	thermal-zones {
-		soc_thermal: soc_thermal {
-			polling-delay = <1000>;
-			polling-delay-passive = <100>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&p_tsensor 0>;
-			trips {
-				pswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				pcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				phot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				pcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-			cooling-maps {
-				cpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				cpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpucore_cool0 0 3>;
-					contribution = <1024>;
-				};
-				gpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				gpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpucore_cool0 0 2>;
-					contribution = <1024>;
-				};
-			};
-		};
-		ddr_thermal: ddr_thermal {
-			polling-delay = <2000>;
-			polling-delay-passive = <1000>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&d_tsensor 1>;
-			trips {
-				dswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dhot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				dcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-		};
-	};
-	/*thermal zone end*/
 
 	cpu_opp_table0: cpu_opp_table0 {
 		compatible = "operating-points-v2";
diff --git a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213_buildroot.dts b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213_buildroot.dts
index 53fc64661fde..ef338543d5e3 100644
--- a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213_buildroot.dts
@@ -823,175 +823,6 @@
 		status = "disabled";
 	};
 	/* Audio Related end */
-	p_tsensor: p_tsensor@ff634594 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-pthermal";
-		status = "okay";
-		reg = <0xff634800 0x50>,
-			<0xff800268 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 35 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* 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 = "okay";
-		reg = <0xff634c00 0x50>,
-			<0xff800230 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 36 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	meson_cooldev: meson-cooldev@0 {
-			status = "okay";
-			compatible = "amlogic, meson-cooldev";
-			device_name = "mcooldev";
-			cooling_devices {
-				cpufreq_cool_cluster0 {
-					min_state = <1000000>;
-					dyn_coeff = <125>;
-					cluster_id = <0>;
-					node_name = "cpufreq_cool0";
-					device_type = "cpufreq";
-				};
-				cpucore_cool_cluster0 {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "cpucore_cool0";
-					device_type = "cpucore";
-				};
-				gpufreq_cool {
-					min_state = <400>;
-					dyn_coeff = <215>;
-					gpu_pp = <2>;
-					cluster_id = <0>;
-					node_name = "gpufreq_cool0";
-					device_type = "gpufreq";
-				};
-				gpucore_cool {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "gpucore_cool0";
-					device_type = "gpucore";
-				};
-			};
-			cpufreq_cool0:cpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			cpucore_cool0:cpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpufreq_cool0:gpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpucore_cool0:gpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-		};
-		/*meson cooling devices end*/
-
-	thermal-zones {
-		soc_thermal: soc_thermal {
-			polling-delay = <1000>;
-			polling-delay-passive = <100>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&p_tsensor 0>;
-			trips {
-				pswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				pcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				phot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				pcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-			cooling-maps {
-				cpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				cpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpucore_cool0 0 3>;
-					contribution = <1024>;
-				};
-				gpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				gpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpucore_cool0 0 2>;
-					contribution = <1024>;
-				};
-			};
-		};
-		ddr_thermal: ddr_thermal {
-			polling-delay = <2000>;
-			polling-delay-passive = <1000>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&d_tsensor 1>;
-			trips {
-				dswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dhot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				dcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-		};
-	};
-	/*thermal zone end*/
 
 	cpu_opp_table0: cpu_opp_table0 {
 		compatible = "operating-points-v2";
diff --git a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac214.dts b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac214.dts
index f997b2b69de8..9fbc83e529c1 100644
--- a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac214.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac214.dts
@@ -770,175 +770,6 @@
 		status = "disabled";
 	};
 	/* Audio Related end */
-	p_tsensor: p_tsensor@ff634594 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-pthermal";
-		status = "okay";
-		reg = <0xff634800 0x50>,
-			<0xff800268 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 35 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* 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 = "okay";
-		reg = <0xff634c00 0x50>,
-			<0xff800230 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 36 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	meson_cooldev: meson-cooldev@0 {
-			status = "okay";
-			compatible = "amlogic, meson-cooldev";
-			device_name = "mcooldev";
-			cooling_devices {
-				cpufreq_cool_cluster0 {
-					min_state = <1000000>;
-					dyn_coeff = <125>;
-					cluster_id = <0>;
-					node_name = "cpufreq_cool0";
-					device_type = "cpufreq";
-				};
-				cpucore_cool_cluster0 {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "cpucore_cool0";
-					device_type = "cpucore";
-				};
-				gpufreq_cool {
-					min_state = <400>;
-					dyn_coeff = <215>;
-					gpu_pp = <2>;
-					cluster_id = <0>;
-					node_name = "gpufreq_cool0";
-					device_type = "gpufreq";
-				};
-				gpucore_cool {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "gpucore_cool0";
-					device_type = "gpucore";
-				};
-			};
-			cpufreq_cool0:cpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			cpucore_cool0:cpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpufreq_cool0:gpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpucore_cool0:gpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-		};
-		/*meson cooling devices end*/
-
-	thermal-zones {
-		soc_thermal: soc_thermal {
-			polling-delay = <1000>;
-			polling-delay-passive = <100>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&p_tsensor 0>;
-			trips {
-				pswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				pcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				phot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				pcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-			cooling-maps {
-				cpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				cpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpucore_cool0 0 3>;
-					contribution = <1024>;
-				};
-				gpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				gpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpucore_cool0 0 2>;
-					contribution = <1024>;
-				};
-			};
-		};
-		ddr_thermal: ddr_thermal {
-			polling-delay = <2000>;
-			polling-delay-passive = <1000>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&d_tsensor 1>;
-			trips {
-				dswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dhot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				dcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-		};
-	};
-	/*thermal zone end*/
 
 	cpu_opp_table0: cpu_opp_table0 {
 		compatible = "operating-points-v2";
diff --git a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac214_buildroot.dts b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac214_buildroot.dts
index 2b1246794e9a..d9c3628512a5 100644
--- a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac214_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac214_buildroot.dts
@@ -823,175 +823,6 @@
 		status = "disabled";
 	};
 	/* Audio Related end */
-	p_tsensor: p_tsensor@ff634594 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-pthermal";
-		status = "okay";
-		reg = <0xff634800 0x50>,
-			<0xff800268 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 35 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* 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 = "okay";
-		reg = <0xff634c00 0x50>,
-			<0xff800230 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 36 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	meson_cooldev: meson-cooldev@0 {
-			status = "okay";
-			compatible = "amlogic, meson-cooldev";
-			device_name = "mcooldev";
-			cooling_devices {
-				cpufreq_cool_cluster0 {
-					min_state = <1000000>;
-					dyn_coeff = <125>;
-					cluster_id = <0>;
-					node_name = "cpufreq_cool0";
-					device_type = "cpufreq";
-				};
-				cpucore_cool_cluster0 {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "cpucore_cool0";
-					device_type = "cpucore";
-				};
-				gpufreq_cool {
-					min_state = <400>;
-					dyn_coeff = <215>;
-					gpu_pp = <2>;
-					cluster_id = <0>;
-					node_name = "gpufreq_cool0";
-					device_type = "gpufreq";
-				};
-				gpucore_cool {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "gpucore_cool0";
-					device_type = "gpucore";
-				};
-			};
-			cpufreq_cool0:cpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			cpucore_cool0:cpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpufreq_cool0:gpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpucore_cool0:gpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-		};
-		/*meson cooling devices end*/
-
-	thermal-zones {
-		soc_thermal: soc_thermal {
-			polling-delay = <1000>;
-			polling-delay-passive = <100>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&p_tsensor 0>;
-			trips {
-				pswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				pcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				phot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				pcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-			cooling-maps {
-				cpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				cpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpucore_cool0 0 3>;
-					contribution = <1024>;
-				};
-				gpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				gpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpucore_cool0 0 2>;
-					contribution = <1024>;
-				};
-			};
-		};
-		ddr_thermal: ddr_thermal {
-			polling-delay = <2000>;
-			polling-delay-passive = <1000>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&d_tsensor 1>;
-			trips {
-				dswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dhot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				dcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-		};
-	};
-	/*thermal zone end*/
 
 	cpu_opp_table0: cpu_opp_table0 {
 		compatible = "operating-points-v2";
diff --git a/arch/arm/boot/dts/amlogic/sm1_s905y3_ac223.dts b/arch/arm/boot/dts/amlogic/sm1_s905y3_ac223.dts
index 352a555b0f30..740eb97c081b 100644
--- a/arch/arm/boot/dts/amlogic/sm1_s905y3_ac223.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905y3_ac223.dts
@@ -744,175 +744,6 @@
 		status = "disabled";
 	};
 	/* Audio Related end */
-	p_tsensor: p_tsensor@ff634594 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-pthermal";
-		status = "okay";
-		reg = <0xff634800 0x50>,
-			<0xff800268 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 35 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* 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 = "okay";
-		reg = <0xff634c00 0x50>,
-			<0xff800230 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 36 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	meson_cooldev: meson-cooldev@0 {
-			status = "okay";
-			compatible = "amlogic, meson-cooldev";
-			device_name = "mcooldev";
-			cooling_devices {
-				cpufreq_cool_cluster0 {
-					min_state = <1000000>;
-					dyn_coeff = <125>;
-					cluster_id = <0>;
-					node_name = "cpufreq_cool0";
-					device_type = "cpufreq";
-				};
-				cpucore_cool_cluster0 {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "cpucore_cool0";
-					device_type = "cpucore";
-				};
-				gpufreq_cool {
-					min_state = <400>;
-					dyn_coeff = <215>;
-					gpu_pp = <2>;
-					cluster_id = <0>;
-					node_name = "gpufreq_cool0";
-					device_type = "gpufreq";
-				};
-				gpucore_cool {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "gpucore_cool0";
-					device_type = "gpucore";
-				};
-			};
-			cpufreq_cool0:cpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			cpucore_cool0:cpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpufreq_cool0:gpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpucore_cool0:gpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-		};
-		/*meson cooling devices end*/
-
-	thermal-zones {
-		soc_thermal: soc_thermal {
-			polling-delay = <1000>;
-			polling-delay-passive = <100>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&p_tsensor 0>;
-			trips {
-				pswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				pcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				phot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				pcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-			cooling-maps {
-				cpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				cpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpucore_cool0 0 3>;
-					contribution = <1024>;
-				};
-				gpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				gpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpucore_cool0 0 2>;
-					contribution = <1024>;
-				};
-			};
-		};
-		ddr_thermal: ddr_thermal {
-			polling-delay = <2000>;
-			polling-delay-passive = <1000>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&d_tsensor 1>;
-			trips {
-				dswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dhot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				dcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-		};
-	};
-	/*thermal zone end*/
 
 	cpu_opp_table0: cpu_opp_table0 {
 		compatible = "operating-points-v2";
diff --git a/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi b/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi
index be3da8a36099..5e4fb04c605f 100644
--- a/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi
@@ -1731,6 +1731,176 @@
 	cpu_ver_name {
 		compatible = "amlogic, cpu-major-id-sm1";
 	};
+
+	p_tsensor: p_tsensor@ff634800 {
+		compatible = "amlogic, r1p1-tsensor";
+		device_name = "meson-pthermal";
+		status = "okay";
+		reg = <0x0 0xff634800 0x0 0x50>,
+			<0x0 0xff800268 0x0 0x4>;
+		cal_type = <0x1>;
+		cal_a = <324>;
+		cal_b = <424>;
+		cal_c = <3159>;
+		cal_d = <9411>;
+		rtemp = <115000>;
+		interrupts = <0 35 0>;
+		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
+		clock-names = "ts_comp";
+		#thermal-sensor-cells = <1>;
+	};
+
+	d_tsensor: d_tsensor@ff634c00 {
+		compatible = "amlogic, r1p1-tsensor";
+		device_name = "meson-dthermal";
+		status = "okay";
+		reg = <0x0 0xff634c00 0x0 0x50>,
+			<0x0 0xff800230 0x0 0x4>;
+		cal_type = <0x1>;
+		cal_a = <324>;
+		cal_b = <424>;
+		cal_c = <3159>;
+		cal_d = <9411>;
+		rtemp = <115000>;
+		interrupts = <0 36 0>;
+		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
+		clock-names = "ts_comp";
+		#thermal-sensor-cells = <1>;
+	};
+
+	meson_cooldev: meson-cooldev@0 {
+			status = "okay";
+			compatible = "amlogic, meson-cooldev";
+			device_name = "mcooldev";
+			cooling_devices {
+				cpufreq_cool_cluster0 {
+					min_state = <1000000>;
+					dyn_coeff = <125>;
+					gpu_pp = <2>;
+					cluster_id = <0>;
+					node_name = "cpufreq_cool0";
+					device_type = "cpufreq";
+				};
+				cpucore_cool_cluster0 {
+					min_state = <1>;
+					dyn_coeff = <0>;
+					gpu_pp = <2>;
+					cluster_id = <0>;
+					node_name = "cpucore_cool0";
+					device_type = "cpucore";
+				};
+				gpufreq_cool {
+					min_state = <400>;
+					dyn_coeff = <215>;
+					gpu_pp = <2>;
+					cluster_id = <0>;
+					node_name = "gpufreq_cool0";
+					device_type = "gpufreq";
+				};
+				gpucore_cool {
+					min_state = <1>;
+					dyn_coeff = <0>;
+					gpu_pp = <2>;
+					cluster_id = <0>;
+					node_name = "gpucore_cool0";
+					device_type = "gpucore";
+				};
+			};
+			cpufreq_cool0:cpufreq_cool0 {
+				#cooling-cells = <2>; /* min followed by max */
+			};
+			cpucore_cool0:cpucore_cool0 {
+				#cooling-cells = <2>; /* min followed by max */
+			};
+			gpufreq_cool0:gpufreq_cool0 {
+				#cooling-cells = <2>; /* min followed by max */
+			};
+			gpucore_cool0:gpucore_cool0 {
+				#cooling-cells = <2>; /* min followed by max */
+			};
+		};/*meson cooling devices end*/
+
+	thermal-zones {
+		soc_thermal: soc_thermal {
+			polling-delay = <1000>;
+			polling-delay-passive = <100>;
+			sustainable-power = <1410>;
+			thermal-sensors = <&p_tsensor 0>;
+			trips {
+				pswitch_on: trip-point@0 {
+					temperature = <60000>;
+					hysteresis = <5000>;
+					type = "passive";
+				};
+				pcontrol: trip-point@1 {
+					temperature = <75000>;
+					hysteresis = <5000>;
+					type = "passive";
+				};
+				phot: trip-point@2 {
+					temperature = <85000>;
+					hysteresis = <5000>;
+					type = "hot";
+				};
+				pcritical: trip-point@3 {
+					temperature = <110000>;
+					hysteresis = <1000>;
+					type = "critical";
+				};
+			};
+
+			cooling-maps {
+				cpufreq_cooling_map {
+					trip = <&pcontrol>;
+					cooling-device = <&cpufreq_cool0 0 4>;
+					contribution = <1024>;
+				};
+				cpucore_cooling_map {
+					trip = <&pcontrol>;
+					cooling-device = <&cpucore_cool0 0 3>;
+					contribution = <1024>;
+				};
+				gpufreq_cooling_map {
+					trip = <&pcontrol>;
+					cooling-device = <&gpufreq_cool0 0 3>;
+					contribution = <1024>;
+				};
+				gpucore_cooling_map {
+					trip = <&pcontrol>;
+					cooling-device = <&gpucore_cool0 0 2>;
+					contribution = <1024>;
+				};
+			};
+		};
+		ddr_thermal: ddr_thermal {
+			polling-delay = <2000>;
+			polling-delay-passive = <1000>;
+			sustainable-power = <1410>;
+			thermal-sensors = <&d_tsensor 1>;
+			trips {
+				dswitch_on: trip-point@0 {
+					temperature = <60000>;
+					hysteresis = <5000>;
+					type = "passive";
+				};
+				dcontrol: trip-point@1 {
+					temperature = <75000>;
+					hysteresis = <5000>;
+					type = "passive";
+				};
+				dhot: trip-point@2 {
+					temperature = <85000>;
+					hysteresis = <5000>;
+					type = "hot";
+				};
+				dcritical: trip-point@3 {
+					temperature = <110000>;
+					hysteresis = <1000>;
+					type = "critical";
+				};
+			};
+		};
+	};/*thermal zone end*/
 };/* end of / */
 
 &pinctrl_aobus {
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts
index 7e4c8b5c6d32..ca6813cef5c9 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts
@@ -814,177 +814,6 @@
 		tuner_xtal_cap = <30>; /* when tuner_xtal_mode = 1, set 25 */
 	};
 
-
-	p_tsensor: p_tsensor@ff634800 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-pthermal";
-		status = "okay";
-		reg = <0x0 0xff634800 0x0 0x50>,
-			<0x0 0xff800268 0x0 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 35 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	d_tsensor: d_tsensor@ff634c00 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-dthermal";
-		status = "okay";
-		reg = <0x0 0xff634c00 0x0 0x50>,
-			<0x0 0xff800230 0x0 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 36 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	meson_cooldev: meson-cooldev@0 {
-			status = "okay";
-			compatible = "amlogic, meson-cooldev";
-			device_name = "mcooldev";
-			cooling_devices {
-				cpufreq_cool_cluster0 {
-					min_state = <1000000>;
-					dyn_coeff = <125>;
-					cluster_id = <0>;
-					node_name = "cpufreq_cool0";
-					device_type = "cpufreq";
-				};
-				cpucore_cool_cluster0 {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "cpucore_cool0";
-					device_type = "cpucore";
-				};
-				gpufreq_cool {
-					min_state = <400>;
-					dyn_coeff = <215>;
-					gpu_pp = <2>;
-					cluster_id = <0>;
-					node_name = "gpufreq_cool0";
-					device_type = "gpufreq";
-				};
-				gpucore_cool {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "gpucore_cool0";
-					device_type = "gpucore";
-				};
-			};
-			cpufreq_cool0:cpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			cpucore_cool0:cpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpufreq_cool0:gpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpucore_cool0:gpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-		};
-		/*meson cooling devices end*/
-
-	thermal-zones {
-		soc_thermal: soc_thermal {
-			polling-delay = <1000>;
-			polling-delay-passive = <100>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&p_tsensor 0>;
-			trips {
-				pswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				pcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				phot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				pcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-			cooling-maps {
-				cpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				cpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpucore_cool0 0 3>;
-					contribution = <1024>;
-				};
-				gpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				gpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpucore_cool0 0 2>;
-					contribution = <1024>;
-				};
-			};
-		};
-		ddr_thermal: ddr_thermal {
-			polling-delay = <2000>;
-			polling-delay-passive = <1000>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&d_tsensor 1>;
-			trips {
-				dswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dhot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				dcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-		};
-	};
-	/*thermal zone end*/
-
 	cpu_opp_table0: cpu_opp_table0 {
 		compatible = "operating-points-v2";
 		opp-shared;
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200_buildroot.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200_buildroot.dts
index fa2eaae3dedd..79d6aa9bed22 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200_buildroot.dts
@@ -884,177 +884,6 @@
 		tuner_xtal_cap = <30>; /* when tuner_xtal_mode = 1, set 25 */
 	};
 
-
-	p_tsensor: p_tsensor@ff634800 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-pthermal";
-		status = "okay";
-		reg = <0x0 0xff634800 0x0 0x50>,
-			<0x0 0xff800268 0x0 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 35 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	d_tsensor: d_tsensor@ff634c00 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-dthermal";
-		status = "okay";
-		reg = <0x0 0xff634c00 0x0 0x50>,
-			<0x0 0xff800230 0x0 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 36 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	meson_cooldev: meson-cooldev@0 {
-			status = "okay";
-			compatible = "amlogic, meson-cooldev";
-			device_name = "mcooldev";
-			cooling_devices {
-				cpufreq_cool_cluster0 {
-					min_state = <1000000>;
-					dyn_coeff = <125>;
-					cluster_id = <0>;
-					node_name = "cpufreq_cool0";
-					device_type = "cpufreq";
-				};
-				cpucore_cool_cluster0 {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "cpucore_cool0";
-					device_type = "cpucore";
-				};
-				gpufreq_cool {
-					min_state = <400>;
-					dyn_coeff = <215>;
-					gpu_pp = <2>;
-					cluster_id = <0>;
-					node_name = "gpufreq_cool0";
-					device_type = "gpufreq";
-				};
-				gpucore_cool {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "gpucore_cool0";
-					device_type = "gpucore";
-				};
-			};
-			cpufreq_cool0:cpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			cpucore_cool0:cpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpufreq_cool0:gpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpucore_cool0:gpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-		};
-		/*meson cooling devices end*/
-
-	thermal-zones {
-		soc_thermal: soc_thermal {
-			polling-delay = <1000>;
-			polling-delay-passive = <100>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&p_tsensor 0>;
-			trips {
-				pswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				pcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				phot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				pcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-			cooling-maps {
-				cpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				cpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpucore_cool0 0 3>;
-					contribution = <1024>;
-				};
-				gpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				gpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpucore_cool0 0 2>;
-					contribution = <1024>;
-				};
-			};
-		};
-		ddr_thermal: ddr_thermal {
-			polling-delay = <2000>;
-			polling-delay-passive = <1000>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&d_tsensor 1>;
-			trips {
-				dswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dhot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				dcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-		};
-	};
-	/*thermal zone end*/
-
 	cpu_opp_table0: cpu_opp_table0 {
 		compatible = "operating-points-v2";
 		opp-shared;
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200_drm_buildroot.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200_drm_buildroot.dts
index 5324681e4b54..a7255f712750 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200_drm_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200_drm_buildroot.dts
@@ -885,177 +885,6 @@
 		tuner_xtal_cap = <30>; /* when tuner_xtal_mode = 1, set 25 */
 	};
 
-
-	p_tsensor: p_tsensor@ff634800 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-pthermal";
-		status = "okay";
-		reg = <0x0 0xff634800 0x0 0x50>,
-			<0x0 0xff800268 0x0 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 35 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	d_tsensor: d_tsensor@ff634c00 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-dthermal";
-		status = "okay";
-		reg = <0x0 0xff634c00 0x0 0x50>,
-			<0x0 0xff800230 0x0 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 36 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	meson_cooldev: meson-cooldev@0 {
-			status = "okay";
-			compatible = "amlogic, meson-cooldev";
-			device_name = "mcooldev";
-			cooling_devices {
-				cpufreq_cool_cluster0 {
-					min_state = <1000000>;
-					dyn_coeff = <125>;
-					cluster_id = <0>;
-					node_name = "cpufreq_cool0";
-					device_type = "cpufreq";
-				};
-				cpucore_cool_cluster0 {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "cpucore_cool0";
-					device_type = "cpucore";
-				};
-				gpufreq_cool {
-					min_state = <400>;
-					dyn_coeff = <215>;
-					gpu_pp = <2>;
-					cluster_id = <0>;
-					node_name = "gpufreq_cool0";
-					device_type = "gpufreq";
-				};
-				gpucore_cool {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "gpucore_cool0";
-					device_type = "gpucore";
-				};
-			};
-			cpufreq_cool0:cpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			cpucore_cool0:cpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpufreq_cool0:gpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpucore_cool0:gpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-		};
-		/*meson cooling devices end*/
-
-	thermal-zones {
-		soc_thermal: soc_thermal {
-			polling-delay = <1000>;
-			polling-delay-passive = <100>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&p_tsensor 0>;
-			trips {
-				pswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				pcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				phot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				pcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-			cooling-maps {
-				cpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				cpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpucore_cool0 0 3>;
-					contribution = <1024>;
-				};
-				gpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				gpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpucore_cool0 0 2>;
-					contribution = <1024>;
-				};
-			};
-		};
-		ddr_thermal: ddr_thermal {
-			polling-delay = <2000>;
-			polling-delay-passive = <1000>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&d_tsensor 1>;
-			trips {
-				dswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dhot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				dcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-		};
-	};
-	/*thermal zone end*/
-
 	cpu_opp_table0: cpu_opp_table0 {
 		compatible = "operating-points-v2";
 		opp-shared;
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts
index 03d68757d56f..70479196df23 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts
@@ -827,177 +827,6 @@
 		tuner_xtal_cap = <30>; /* when tuner_xtal_mode = 1, set 25 */
 	};
 
-
-	p_tsensor: p_tsensor@ff634800 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-pthermal";
-		status = "okay";
-		reg = <0x0 0xff634800 0x0 0x50>,
-			<0x0 0xff800268 0x0 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 35 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	d_tsensor: d_tsensor@ff634c00 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-dthermal";
-		status = "okay";
-		reg = <0x0 0xff634c00 0x0 0x50>,
-			<0x0 0xff800230 0x0 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 36 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	meson_cooldev: meson-cooldev@0 {
-			status = "okay";
-			compatible = "amlogic, meson-cooldev";
-			device_name = "mcooldev";
-			cooling_devices {
-				cpufreq_cool_cluster0 {
-					min_state = <1000000>;
-					dyn_coeff = <125>;
-					cluster_id = <0>;
-					node_name = "cpufreq_cool0";
-					device_type = "cpufreq";
-				};
-				cpucore_cool_cluster0 {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "cpucore_cool0";
-					device_type = "cpucore";
-				};
-				gpufreq_cool {
-					min_state = <400>;
-					dyn_coeff = <215>;
-					gpu_pp = <2>;
-					cluster_id = <0>;
-					node_name = "gpufreq_cool0";
-					device_type = "gpufreq";
-				};
-				gpucore_cool {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "gpucore_cool0";
-					device_type = "gpucore";
-				};
-			};
-			cpufreq_cool0:cpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			cpucore_cool0:cpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpufreq_cool0:gpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpucore_cool0:gpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-		};
-		/*meson cooling devices end*/
-
-	thermal-zones {
-		soc_thermal: soc_thermal {
-			polling-delay = <1000>;
-			polling-delay-passive = <100>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&p_tsensor 0>;
-			trips {
-				pswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				pcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				phot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				pcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-			cooling-maps {
-				cpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				cpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpucore_cool0 0 3>;
-					contribution = <1024>;
-				};
-				gpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				gpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpucore_cool0 0 2>;
-					contribution = <1024>;
-				};
-			};
-		};
-		ddr_thermal: ddr_thermal {
-			polling-delay = <2000>;
-			polling-delay-passive = <1000>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&d_tsensor 1>;
-			trips {
-				dswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dhot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				dcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-		};
-	};
-	/*thermal zone end*/
-
 	cpu_opp_table0: cpu_opp_table0 {
 		compatible = "operating-points-v2";
 		opp-shared;
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
index 939ea7fb6f08..85cbd637c21c 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
@@ -827,177 +827,6 @@
 		tuner_xtal_cap = <30>; /* when tuner_xtal_mode = 1, set 25 */
 	};
 
-
-	p_tsensor: p_tsensor@ff634800 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-pthermal";
-		status = "okay";
-		reg = <0x0 0xff634800 0x0 0x50>,
-			<0x0 0xff800268 0x0 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 35 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	d_tsensor: d_tsensor@ff634c00 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-dthermal";
-		status = "okay";
-		reg = <0x0 0xff634c00 0x0 0x50>,
-			<0x0 0xff800230 0x0 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 36 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	meson_cooldev: meson-cooldev@0 {
-			status = "okay";
-			compatible = "amlogic, meson-cooldev";
-			device_name = "mcooldev";
-			cooling_devices {
-				cpufreq_cool_cluster0 {
-					min_state = <1000000>;
-					dyn_coeff = <125>;
-					cluster_id = <0>;
-					node_name = "cpufreq_cool0";
-					device_type = "cpufreq";
-				};
-				cpucore_cool_cluster0 {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "cpucore_cool0";
-					device_type = "cpucore";
-				};
-				gpufreq_cool {
-					min_state = <400>;
-					dyn_coeff = <215>;
-					gpu_pp = <2>;
-					cluster_id = <0>;
-					node_name = "gpufreq_cool0";
-					device_type = "gpufreq";
-				};
-				gpucore_cool {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "gpucore_cool0";
-					device_type = "gpucore";
-				};
-			};
-			cpufreq_cool0:cpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			cpucore_cool0:cpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpufreq_cool0:gpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpucore_cool0:gpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-		};
-		/*meson cooling devices end*/
-
-	thermal-zones {
-		soc_thermal: soc_thermal {
-			polling-delay = <1000>;
-			polling-delay-passive = <100>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&p_tsensor 0>;
-			trips {
-				pswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				pcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				phot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				pcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-			cooling-maps {
-				cpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				cpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpucore_cool0 0 3>;
-					contribution = <1024>;
-				};
-				gpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				gpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpucore_cool0 0 2>;
-					contribution = <1024>;
-				};
-			};
-		};
-		ddr_thermal: ddr_thermal {
-			polling-delay = <2000>;
-			polling-delay-passive = <1000>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&d_tsensor 1>;
-			trips {
-				dswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dhot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				dcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-		};
-	};
-	/*thermal zone end*/
-
 	cpu_opp_table0: cpu_opp_table0 {
 		compatible = "operating-points-v2";
 		opp-shared;
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts
index 7e90fa1b86a8..88281d9fd86c 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts
@@ -815,175 +815,6 @@
 		tuner_xtal_cap = <30>; /* when tuner_xtal_mode = 1, set 25 */
 	};
 
-	p_tsensor: p_tsensor@ff634800 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-pthermal";
-		status = "okay";
-		reg = <0x0 0xff634800 0x0 0x50>,
-			<0x0 0xff800268 0x0 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 35 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	d_tsensor: d_tsensor@ff634c00 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-dthermal";
-		status = "okay";
-		reg = <0x0 0xff634c00 0x0 0x50>,
-			<0x0 0xff800230 0x0 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 36 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	meson_cooldev: meson-cooldev@0 {
-			status = "okay";
-			compatible = "amlogic, meson-cooldev";
-			device_name = "mcooldev";
-			cooling_devices {
-				cpufreq_cool_cluster0 {
-					min_state = <1000000>;
-					dyn_coeff = <125>;
-					cluster_id = <0>;
-					node_name = "cpufreq_cool0";
-					device_type = "cpufreq";
-				};
-				cpucore_cool_cluster0 {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "cpucore_cool0";
-					device_type = "cpucore";
-				};
-				gpufreq_cool {
-					min_state = <400>;
-					dyn_coeff = <215>;
-					gpu_pp = <2>;
-					cluster_id = <0>;
-					node_name = "gpufreq_cool0";
-					device_type = "gpufreq";
-				};
-				gpucore_cool {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "gpucore_cool0";
-					device_type = "gpucore";
-				};
-			};
-			cpufreq_cool0:cpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			cpucore_cool0:cpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpufreq_cool0:gpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpucore_cool0:gpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-		};
-		/*meson cooling devices end*/
-
-	thermal-zones {
-		soc_thermal: soc_thermal {
-			polling-delay = <1000>;
-			polling-delay-passive = <100>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&p_tsensor 0>;
-			trips {
-				pswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				pcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				phot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				pcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-			cooling-maps {
-				cpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				cpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpucore_cool0 0 3>;
-					contribution = <1024>;
-				};
-				gpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				gpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpucore_cool0 0 2>;
-					contribution = <1024>;
-				};
-			};
-		};
-		ddr_thermal: ddr_thermal {
-			polling-delay = <2000>;
-			polling-delay-passive = <1000>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&d_tsensor 1>;
-			trips {
-				dswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dhot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				dcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-		};
-	};
-	/*thermal zone end*/
 
 	cpu_opp_table0: cpu_opp_table0 {
 		compatible = "operating-points-v2";
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts
index b5921658b6da..62c7755828d1 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts
@@ -814,175 +814,6 @@
 		status = "disabled";
 	};
 	/* Audio Related end */
-	p_tsensor: p_tsensor@ff634594 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-pthermal";
-		status = "okay";
-		reg = <0x0 0xff634800 0x0 0x50>,
-			<0x0 0xff800268 0x0 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 35 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* 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 = "okay";
-		reg = <0x0 0xff634c00 0x0 0x50>,
-			<0x0 0xff800230 0x0 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 36 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	meson_cooldev: meson-cooldev@0 {
-			status = "okay";
-			compatible = "amlogic, meson-cooldev";
-			device_name = "mcooldev";
-			cooling_devices {
-				cpufreq_cool_cluster0 {
-					min_state = <1000000>;
-					dyn_coeff = <125>;
-					cluster_id = <0>;
-					node_name = "cpufreq_cool0";
-					device_type = "cpufreq";
-				};
-				cpucore_cool_cluster0 {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "cpucore_cool0";
-					device_type = "cpucore";
-				};
-				gpufreq_cool {
-					min_state = <400>;
-					dyn_coeff = <215>;
-					gpu_pp = <2>;
-					cluster_id = <0>;
-					node_name = "gpufreq_cool0";
-					device_type = "gpufreq";
-				};
-				gpucore_cool {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "gpucore_cool0";
-					device_type = "gpucore";
-				};
-			};
-			cpufreq_cool0:cpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			cpucore_cool0:cpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpufreq_cool0:gpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpucore_cool0:gpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-		};
-		/*meson cooling devices end*/
-
-	thermal-zones {
-		soc_thermal: soc_thermal {
-			polling-delay = <1000>;
-			polling-delay-passive = <100>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&p_tsensor 0>;
-			trips {
-				pswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				pcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				phot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				pcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-			cooling-maps {
-				cpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				cpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpucore_cool0 0 3>;
-					contribution = <1024>;
-				};
-				gpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				gpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpucore_cool0 0 2>;
-					contribution = <1024>;
-				};
-			};
-		};
-		ddr_thermal: ddr_thermal {
-			polling-delay = <2000>;
-			polling-delay-passive = <1000>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&d_tsensor 1>;
-			trips {
-				dswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dhot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				dcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-		};
-	};
-	/*thermal zone end*/
 
 	cpu_opp_table0: cpu_opp_table0 {
 		compatible = "operating-points-v2";
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213_buildroot.dts b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213_buildroot.dts
index fd5fd75a58f5..afdfd89f74b7 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213_buildroot.dts
@@ -900,175 +900,6 @@
 		status = "disabled";
 	};
 	/* Audio Related end */
-	p_tsensor: p_tsensor@ff634594 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-pthermal";
-		status = "okay";
-		reg = <0x0 0xff634800 0x0 0x50>,
-			<0x0 0xff800268 0x0 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 35 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* 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 = "okay";
-		reg = <0x0 0xff634c00 0x0 0x50>,
-			<0x0 0xff800230 0x0 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 36 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	meson_cooldev: meson-cooldev@0 {
-			status = "okay";
-			compatible = "amlogic, meson-cooldev";
-			device_name = "mcooldev";
-			cooling_devices {
-				cpufreq_cool_cluster0 {
-					min_state = <1000000>;
-					dyn_coeff = <125>;
-					cluster_id = <0>;
-					node_name = "cpufreq_cool0";
-					device_type = "cpufreq";
-				};
-				cpucore_cool_cluster0 {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "cpucore_cool0";
-					device_type = "cpucore";
-				};
-				gpufreq_cool {
-					min_state = <400>;
-					dyn_coeff = <215>;
-					gpu_pp = <2>;
-					cluster_id = <0>;
-					node_name = "gpufreq_cool0";
-					device_type = "gpufreq";
-				};
-				gpucore_cool {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "gpucore_cool0";
-					device_type = "gpucore";
-				};
-			};
-			cpufreq_cool0:cpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			cpucore_cool0:cpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpufreq_cool0:gpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpucore_cool0:gpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-		};
-		/*meson cooling devices end*/
-
-	thermal-zones {
-		soc_thermal: soc_thermal {
-			polling-delay = <1000>;
-			polling-delay-passive = <100>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&p_tsensor 0>;
-			trips {
-				pswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				pcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				phot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				pcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-			cooling-maps {
-				cpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				cpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpucore_cool0 0 3>;
-					contribution = <1024>;
-				};
-				gpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				gpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpucore_cool0 0 2>;
-					contribution = <1024>;
-				};
-			};
-		};
-		ddr_thermal: ddr_thermal {
-			polling-delay = <2000>;
-			polling-delay-passive = <1000>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&d_tsensor 1>;
-			trips {
-				dswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dhot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				dcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-		};
-	};
-	/*thermal zone end*/
 
 	cpu_opp_table0: cpu_opp_table0 {
 		compatible = "operating-points-v2";
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214.dts b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214.dts
index 1cf3b998dd6d..57cc1d0cde1b 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214.dts
@@ -836,175 +836,6 @@
 		status = "disabled";
 	};
 	/* Audio Related end */
-	p_tsensor: p_tsensor@ff634594 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-pthermal";
-		status = "okay";
-		reg = <0x0 0xff634800 0x0 0x50>,
-			<0x0 0xff800268 0x0 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 35 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* 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 = "okay";
-		reg = <0x0 0xff634c00 0x0 0x50>,
-			<0x0 0xff800230 0x0 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 36 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	meson_cooldev: meson-cooldev@0 {
-			status = "okay";
-			compatible = "amlogic, meson-cooldev";
-			device_name = "mcooldev";
-			cooling_devices {
-				cpufreq_cool_cluster0 {
-					min_state = <1000000>;
-					dyn_coeff = <125>;
-					cluster_id = <0>;
-					node_name = "cpufreq_cool0";
-					device_type = "cpufreq";
-				};
-				cpucore_cool_cluster0 {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "cpucore_cool0";
-					device_type = "cpucore";
-				};
-				gpufreq_cool {
-					min_state = <400>;
-					dyn_coeff = <215>;
-					gpu_pp = <2>;
-					cluster_id = <0>;
-					node_name = "gpufreq_cool0";
-					device_type = "gpufreq";
-				};
-				gpucore_cool {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "gpucore_cool0";
-					device_type = "gpucore";
-				};
-			};
-			cpufreq_cool0:cpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			cpucore_cool0:cpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpufreq_cool0:gpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpucore_cool0:gpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-		};
-		/*meson cooling devices end*/
-
-	thermal-zones {
-		soc_thermal: soc_thermal {
-			polling-delay = <1000>;
-			polling-delay-passive = <100>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&p_tsensor 0>;
-			trips {
-				pswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				pcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				phot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				pcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-			cooling-maps {
-				cpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				cpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpucore_cool0 0 3>;
-					contribution = <1024>;
-				};
-				gpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				gpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpucore_cool0 0 2>;
-					contribution = <1024>;
-				};
-			};
-		};
-		ddr_thermal: ddr_thermal {
-			polling-delay = <2000>;
-			polling-delay-passive = <1000>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&d_tsensor 1>;
-			trips {
-				dswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dhot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				dcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-		};
-	};
-	/*thermal zone end*/
 
 	cpu_opp_table0: cpu_opp_table0 {
 		compatible = "operating-points-v2";
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214_buildroot.dts b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214_buildroot.dts
index 336569a7c653..37c06e499805 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214_buildroot.dts
@@ -900,175 +900,6 @@
 		status = "disabled";
 	};
 	/* Audio Related end */
-	p_tsensor: p_tsensor@ff634594 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-pthermal";
-		status = "okay";
-		reg = <0x0 0xff634800 0x0 0x50>,
-			<0x0 0xff800268 0x0 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 35 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* 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 = "okay";
-		reg = <0x0 0xff634c00 0x0 0x50>,
-			<0x0 0xff800230 0x0 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 36 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	meson_cooldev: meson-cooldev@0 {
-			status = "okay";
-			compatible = "amlogic, meson-cooldev";
-			device_name = "mcooldev";
-			cooling_devices {
-				cpufreq_cool_cluster0 {
-					min_state = <1000000>;
-					dyn_coeff = <125>;
-					cluster_id = <0>;
-					node_name = "cpufreq_cool0";
-					device_type = "cpufreq";
-				};
-				cpucore_cool_cluster0 {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "cpucore_cool0";
-					device_type = "cpucore";
-				};
-				gpufreq_cool {
-					min_state = <400>;
-					dyn_coeff = <215>;
-					gpu_pp = <2>;
-					cluster_id = <0>;
-					node_name = "gpufreq_cool0";
-					device_type = "gpufreq";
-				};
-				gpucore_cool {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "gpucore_cool0";
-					device_type = "gpucore";
-				};
-			};
-			cpufreq_cool0:cpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			cpucore_cool0:cpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpufreq_cool0:gpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpucore_cool0:gpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-		};
-		/*meson cooling devices end*/
-
-	thermal-zones {
-		soc_thermal: soc_thermal {
-			polling-delay = <1000>;
-			polling-delay-passive = <100>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&p_tsensor 0>;
-			trips {
-				pswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				pcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				phot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				pcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-			cooling-maps {
-				cpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				cpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpucore_cool0 0 3>;
-					contribution = <1024>;
-				};
-				gpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				gpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpucore_cool0 0 2>;
-					contribution = <1024>;
-				};
-			};
-		};
-		ddr_thermal: ddr_thermal {
-			polling-delay = <2000>;
-			polling-delay-passive = <1000>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&d_tsensor 1>;
-			trips {
-				dswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dhot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				dcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-		};
-	};
-	/*thermal zone end*/
 
 	cpu_opp_table0: cpu_opp_table0 {
 		compatible = "operating-points-v2";
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905y3_ac223.dts b/arch/arm64/boot/dts/amlogic/sm1_s905y3_ac223.dts
index 34c3da951dd4..a8ae5f2a7a0a 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_s905y3_ac223.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905y3_ac223.dts
@@ -808,175 +808,6 @@
 		status = "disabled";
 	};
 	/* Audio Related end */
-	p_tsensor: p_tsensor@ff634594 {
-		compatible = "amlogic, r1p1-tsensor";
-		device_name = "meson-pthermal";
-		status = "okay";
-		reg = <0x0 0xff634800 0x0 0x50>,
-			<0x0 0xff800268 0x0 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 35 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* 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 = "okay";
-		reg = <0x0 0xff634c00 0x0 0x50>,
-			<0x0 0xff800230 0x0 0x4>;
-		cal_type = <0x1>;
-		cal_a = <324>;
-		cal_b = <424>;
-		cal_c = <3159>;
-		cal_d = <9411>;
-		rtemp = <115000>;
-		interrupts = <0 36 0>;
-		clocks = <&clkc CLKID_TS_COMP>; /* CLKID_TS_COMP>;*/
-		clock-names = "ts_comp";
-		#thermal-sensor-cells = <1>;
-	};
-
-	meson_cooldev: meson-cooldev@0 {
-			status = "okay";
-			compatible = "amlogic, meson-cooldev";
-			device_name = "mcooldev";
-			cooling_devices {
-				cpufreq_cool_cluster0 {
-					min_state = <1000000>;
-					dyn_coeff = <125>;
-					cluster_id = <0>;
-					node_name = "cpufreq_cool0";
-					device_type = "cpufreq";
-				};
-				cpucore_cool_cluster0 {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "cpucore_cool0";
-					device_type = "cpucore";
-				};
-				gpufreq_cool {
-					min_state = <400>;
-					dyn_coeff = <215>;
-					gpu_pp = <2>;
-					cluster_id = <0>;
-					node_name = "gpufreq_cool0";
-					device_type = "gpufreq";
-				};
-				gpucore_cool {
-					min_state = <1>;
-					dyn_coeff = <0>;
-					cluster_id = <0>;
-					node_name = "gpucore_cool0";
-					device_type = "gpucore";
-				};
-			};
-			cpufreq_cool0:cpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			cpucore_cool0:cpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpufreq_cool0:gpufreq_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-			gpucore_cool0:gpucore_cool0 {
-				#cooling-cells = <2>; /* min followed by max */
-			};
-		};
-		/*meson cooling devices end*/
-
-	thermal-zones {
-		soc_thermal: soc_thermal {
-			polling-delay = <1000>;
-			polling-delay-passive = <100>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&p_tsensor 0>;
-			trips {
-				pswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				pcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				phot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				pcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-			cooling-maps {
-				cpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				cpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&cpucore_cool0 0 3>;
-					contribution = <1024>;
-				};
-				gpufreq_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpufreq_cool0 0 4>;
-					contribution = <1024>;
-				};
-				gpucore_cooling_map {
-					trip = <&pcontrol>;
-					cooling-device = <&gpucore_cool0 0 2>;
-					contribution = <1024>;
-				};
-			};
-		};
-		ddr_thermal: ddr_thermal {
-			polling-delay = <2000>;
-			polling-delay-passive = <1000>;
-			sustainable-power = <1410>;
-			thermal-sensors = <&d_tsensor 1>;
-			trips {
-				dswitch_on: trip-point@0 {
-					temperature = <60000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dcontrol: trip-point@1 {
-					temperature = <75000>;
-					hysteresis = <5000>;
-					type = "passive";
-				};
-				dhot: trip-point@2 {
-					temperature = <85000>;
-					hysteresis = <5000>;
-					type = "hot";
-				};
-				dcritical: trip-point@3 {
-					temperature = <110000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
-			};
-
-		};
-	};
-	/*thermal zone end*/
 
 	cpu_opp_table0: cpu_opp_table0 {
 		compatible = "operating-points-v2";