diff --git a/tegra234-p3701-0000.dtsi b/tegra234-p3701-0000.dtsi
index 2378da3..31ecb53 100644
--- a/tegra234-p3701-0000.dtsi
+++ b/tegra234-p3701-0000.dtsi
@@ -139,4 +139,26 @@
 		gpio = <&gpio TEGRA234_MAIN_GPIO(A, 1) GPIO_ACTIVE_LOW>;
 		regulator-boot-on;
 	};
+
+	thermal-zones {
+		tj-thermal {
+			polling-delay = <1000>;
+			polling-delay-passive = <1000>;
+			status = "okay";
+
+			trips {
+				tj_trip_active0: active-0 {
+					temperature = <75000>;
+					hysteresis = <4000>;
+					type = "active";
+				};
+
+				tj_trip_active1: active-1 {
+					temperature = <95000>;
+					hysteresis = <4000>;
+					type = "active";
+				};
+			};
+		};
+	};
 };
diff --git a/tegra234-p3737-0000+p3701-0000.dts b/tegra234-p3737-0000+p3701-0000.dts
index ef2ce47..c507f75 100644
--- a/tegra234-p3737-0000+p3701-0000.dts
+++ b/tegra234-p3737-0000+p3701-0000.dts
@@ -2283,11 +2283,7 @@
 	};
 
 	pwm-fan {
-		compatible = "pwm-fan";
-		pwms = <&pwm3 0 45334>;
-
-		cooling-levels = <0 95 178 255>;
-		#cooling-cells = <2>;
+		cooling-levels = <66 215 255>;
 	};
 
 	serial {
@@ -2356,4 +2352,20 @@
 
 		label = "NVIDIA Jetson AGX Orin APE";
 	};
+
+	thermal-zones {
+                tj-thermal {
+                        cooling-maps {
+                                map-active-0 {
+                                        cooling-device = <&fan 0 1>;
+                                        trip = <&tj_trip_active0>;
+                                };
+
+                                map-active-1 {
+                                        cooling-device = <&fan 1 2>;
+                                        trip = <&tj_trip_active1>;
+                                };
+                        };
+                };
+        };
 };
diff --git a/tegra234-p3737-0000.dtsi b/tegra234-p3737-0000.dtsi
index 022a540..d94147f 100644
--- a/tegra234-p3737-0000.dtsi
+++ b/tegra234-p3737-0000.dtsi
@@ -33,6 +33,12 @@
 		};
 	};
 
+	fan: pwm-fan {
+		compatible = "pwm-fan";
+		pwms = <&pwm3 0 45334>;
+		#cooling-cells = <2>;
+	};
+
 	vdd_1v8_sys: regulator-vdd-1v8-sys {
 		compatible = "regulator-fixed";
 		regulator-name = "VDD_1V8_SYS";