arm64: tegra: Enable thermal support on Jetson Orin NX

Enable the TJ thermal zone and hook up cooling maps for the PWM-
controlled fan and two trip points.

This also removes a duplicate definition of the PWM fan and changes its
cooling levels. This should have no effect, though, because the fan
wasn't previously connected to anything and by default would be turned
off at probe time.

Acked-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm64/boot/dts/nvidia/tegra234-p3767.dtsi b/arch/arm64/boot/dts/nvidia/tegra234-p3767.dtsi
index bd60478..a8aa6e7 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra234-p3767.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra234-p3767.dtsi
@@ -99,74 +99,24 @@
        };
 
        thermal-zones {
-               /*
-                * This monitoring is far from optimal, but it's good enough
-                * at this stage.
-                */
-               cpu-thermal {
+               tj-thermal {
                        polling-delay = <1000>;
                        polling-delay-passive = <1000>;
                        status = "okay";
 
                        trips {
-                               critical {
-                                       temperature = <104500>;
-                                       hysteresis = <0>;
-                                       type = "critical";
-                               };
-
-                               hot {
-                                       temperature = <99000>;
-                                       hysteresis = <1000>;
-                                       type = "hot";
-                               };
-
-                               board_trip_passive: passive {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               board_trip_active2: active-2 {
-                                       temperature = <80000>;
+                               tj_trip_active0: active-0 {
+                                       temperature = <74000>;
                                        hysteresis = <4000>;
                                        type = "active";
                                };
 
-                               board_trip_active1: active-1 {
-                                       temperature = <65000>;
-                                       hysteresis = <4000>;
-                                       type = "active";
-                               };
-
-                               board_trip_active0: active-0 {
-                                       temperature = <50000>;
+                               tj_trip_active1: active-1 {
+                                       temperature = <95000>;
                                        hysteresis = <4000>;
                                        type = "active";
                                };
                        };
-
-                       cooling-maps {
-                               passive {
-                                       cooling-device = <&fan 3 3>;
-                                       trip = <&board_trip_passive>;
-                               };
-
-                               active2 {
-                                       cooling-device = <&fan 2 3>;
-                                       trip = <&board_trip_active2>;
-                               };
-
-                               active1 {
-                                       cooling-device = <&fan 1 2>;
-                                       trip = <&board_trip_active1>;
-                               };
-
-                               active0 {
-                                       cooling-device = <&fan 0 1>;
-                                       trip = <&board_trip_active0>;
-                               };
-                       };
                };
        };
 };

diff --git a/arch/arm64/boot/dts/nvidia/tegra234-p3768-0000+p3767-0000.dts b/arch/arm64/boot/dts/nvidia/tegra234-p3768-0000+p3767-0000.dts
index 7dfbc38..65e4b51 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra234-p3768-0000+p3767-0000.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra234-p3768-0000+p3767-0000.dts
@@ -112,11 +112,8 @@
                };
        };
 
-       fan: pwm-fan {
-               compatible = "pwm-fan";
-               pwms = <&pwm3 0 45334>;
-               cooling-levels = <0 95 178 255>;
-               #cooling-cells = <2>;
+       pwm-fan {
+               cooling-levels = <0 187 255>;
        };
 
        vdd_3v3_pcie: regulator-vdd-3v3-pcie {
@@ -131,4 +128,20 @@
        serial {
                status = "okay";
        };
+
+       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/arch/arm64/boot/dts/nvidia/tegra234-p3768-0000.dtsi b/arch/arm64/boot/dts/nvidia/tegra234-p3768-0000.dtsi
index bbd68ef..c7291ba 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra234-p3768-0000.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra234-p3768-0000.dtsi
@@ -209,7 +209,6 @@
        fan: pwm-fan {
                compatible = "pwm-fan";
                pwms = <&pwm3 0 45334>;
-               cooling-levels = <0 95 178 255>;
                #cooling-cells = <2>;
        };