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 bd60478fa75e7c9a644c4c5556a8ac48ed436480..a8aa6e7d8fbc51718aa85f071d705aa5a1ffd01c 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 7dfbc38eb3c456ad991f3b20120501ea08417e39..65e4b51b79c1b1dbe81bfce9ea2aba0dcdcc2daf 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 bbd68ef93d97989487d0c78dcaf623589e1d7c79..c7291ba27cfa776a8dbf2d0248aa0eb56f00c018 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>;
        };