diff --git a/arch/arm64/boot/dts/freescale/imx8mq.dtsi b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
index 230f198ad87a07070480450d407c444742d00194..feb195984997935041ba9e5b39d1d129d3ff7fba 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
@@ -167,6 +167,67 @@
 		method = "smc";
 	};
 
+	thermal-zones {
+		cpu-thermal {
+			polling-delay-passive = <250>;
+			polling-delay = <2000>;
+			thermal-sensors = <&tmu 0>;
+
+			trips {
+				cpu_alert: cpu-alert {
+					temperature = <80000>;
+					hysteresis = <2000>;
+					type = "passive";
+				};
+
+				cpu-crit {
+					temperature = <90000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+
+			cooling-maps {
+				map0 {
+					trip = <&cpu_alert>;
+					cooling-device =
+						<&A53_0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+						<&A53_1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+						<&A53_2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+						<&A53_3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+				};
+			};
+		};
+
+		gpu-thermal {
+			polling-delay-passive = <250>;
+			polling-delay = <2000>;
+			thermal-sensors = <&tmu 1>;
+
+			trips {
+				gpu-crit {
+					temperature = <90000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+		};
+
+		vpu-thermal {
+			polling-delay-passive = <250>;
+			polling-delay = <2000>;
+			thermal-sensors = <&tmu 2>;
+
+			trips {
+				vpu-crit {
+					temperature = <90000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+		};
+	};
+
 	timer {
 		compatible = "arm,armv8-timer";
 		interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>, /* Physical Secure */
@@ -302,67 +363,6 @@
 				#thermal-sensor-cells =  <1>;
 			};
 
-			thermal-zones {
-				cpu-thermal {
-					polling-delay-passive = <250>;
-					polling-delay = <2000>;
-					thermal-sensors = <&tmu 0>;
-
-					trips {
-						cpu_alert: cpu-alert {
-							temperature = <80000>;
-							hysteresis = <2000>;
-							type = "passive";
-						};
-
-						cpu-crit {
-							temperature = <90000>;
-							hysteresis = <2000>;
-							type = "critical";
-						};
-					};
-
-					cooling-maps {
-						map0 {
-							trip = <&cpu_alert>;
-							cooling-device =
-								<&A53_0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-								<&A53_1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-								<&A53_2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-								<&A53_3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-						};
-					};
-				};
-
-				gpu-thermal {
-					polling-delay-passive = <250>;
-					polling-delay = <2000>;
-					thermal-sensors = <&tmu 1>;
-
-					trips {
-						gpu-crit {
-							temperature = <90000>;
-							hysteresis = <2000>;
-							type = "critical";
-						};
-					};
-				};
-
-				vpu-thermal {
-					polling-delay-passive = <250>;
-					polling-delay = <2000>;
-					thermal-sensors = <&tmu 2>;
-
-					trips {
-						vpu-crit {
-							temperature = <90000>;
-							hysteresis = <2000>;
-							type = "critical";
-						};
-					};
-				};
-			};
-
 			wdog1: watchdog@30280000 {
 				compatible = "fsl,imx8mq-wdt", "fsl,imx21-wdt";
 				reg = <0x30280000 0x10000>;