From 2352a5f8220445d209f4ab0584bfcf7cacfa0426 Mon Sep 17 00:00:00 2001
From: Yi-Wei Wang <yiweiw@nvidia.com>
Date: Mon, 24 Jul 2023 19:16:32 +0800
Subject: [PATCH] [UPSTREAM v6.5]: arm64: tegra: Enable thermal support on
 Jetson AGX Orin

Add thermal zone details and enable the PWM fan as cooling device.

Note that this also changes the cooling levels for the PWM fan, which
should have no effect, though, because the fan wasn't previously
connected to anything and by default would be turned off at probe time.

Cherry picked from commit 1d3fbd3d41a6c7552126ce39b81591de942a4207

Bug 3960800
Bug 4035713
Bug 4204722

Acked-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Yi-Wei Wang <yiweiw@nvidia.com>
Change-Id: Ice10f86ddbbd5c27b1967f1df2d840c69e002651
Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/2941395
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
---
 tegra234-p3701-0000.dtsi           | 22 ++++++++++++++++++++++
 tegra234-p3737-0000+p3701-0000.dts | 22 +++++++++++++++++-----
 tegra234-p3737-0000.dtsi           |  6 ++++++
 3 files changed, 45 insertions(+), 5 deletions(-)

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";