arm: tegra: set critical trips for Tegra124

Set general "critical" trip temperatures for cpu, gpu, mem and pllx
thermal zones for all Tegra124 platform, these trips can trigger
shut down or reset.
Tegra124 Jetson TK1 was already set "critical" trips before, so it
can overwrite the general values.

Signed-off-by: Wei Ni <wni@nvidia.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>

diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
index 6403e0de540e842b952b3bb02b5673bbbfb3e683..3cdc2326bc4f22cb66de0332835f999b1cec9719 100644 (file)
--- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
@@ -2045,44 +2045,32 @@
        thermal-zones {
                cpu {
                        trips {
-                               trip {
+                               cpu-shutdown-trip {
                                        temperature = <101000>;
                                        hysteresis = <0>;
                                        type = "critical";
                                };
                        };
-
-                       cooling-maps {
-                               /* There are currently no cooling maps because there are no cooling devices */
-                       };
                };
 
                mem {
                        trips {
-                               trip {
+                               mem-shutdown-trip {
                                        temperature = <101000>;
                                        hysteresis = <0>;
                                        type = "critical";
                                };
                        };
-
-                       cooling-maps {
-                               /* There are currently no cooling maps because there are no cooling devices */
-                       };
                };
 
                gpu {
                        trips {
-                               trip {
+                               gpu-shutdown-trip {
                                        temperature = <101000>;
                                        hysteresis = <0>;
                                        type = "critical";
                                };
                        };
-
-                       cooling-maps {
-                               /* There are currently no cooling maps because there are no cooling devices */
-                       };
                };
        };
 };

diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
index ea340f9de44802124829153b7065691a83b3bc12..61c36a36f0c90f089b27cc24caeaaa97aae2255a 100644 (file)
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -1154,6 +1154,21 @@
 
                        thermal-sensors =
                                <&soctherm TEGRA124_SOCTHERM_SENSOR_CPU>;
+
+                       trips {
+                               cpu-shutdown-trip {
+                                       temperature = <103000>;
+                                       hysteresis = <0>;
+                                       type = "critical";
+                               };
+                       };
+
+                       cooling-maps {
+                               /*
+                                * There are currently no cooling maps,
+                                * because there are no cooling devices.
+                                */
+                       };
                };
 
                mem {
@@ -1162,6 +1177,21 @@
 
                        thermal-sensors =
                                <&soctherm TEGRA124_SOCTHERM_SENSOR_MEM>;
+
+                       trips {
+                               mem-shutdown-trip {
+                                       temperature = <103000>;
+                                       hysteresis = <0>;
+                                       type = "critical";
+                               };
+                       };
+
+                       cooling-maps {
+                               /*
+                                * There are currently no cooling maps,
+                                * because there are no cooling devices.
+                                */
+                       };
                };
 
                gpu {
@@ -1170,6 +1200,21 @@
 
                        thermal-sensors =
                                <&soctherm TEGRA124_SOCTHERM_SENSOR_GPU>;
+
+                       trips {
+                               gpu-shutdown-trip {
+                                       temperature = <101000>;
+                                       hysteresis = <0>;
+                                       type = "critical";
+                               };
+                       };
+
+                       cooling-maps {
+                               /*
+                                * There are currently no cooling maps,
+                                * because there are no cooling devices.
+                                */
+                       };
                };
 
                pllx {
@@ -1178,6 +1223,21 @@
 
                        thermal-sensors =
                                <&soctherm TEGRA124_SOCTHERM_SENSOR_PLLX>;
+
+                       trips {
+                               pllx-shutdown-trip {
+                                       temperature = <103000>;
+                                       hysteresis = <0>;
+                                       type = "critical";
+                               };
+                       };
+
+                       cooling-maps {
+                               /*
+                                * There are currently no cooling maps,
+                                * because there are no cooling devices.
+                                */
+                       };
                };
        };