Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1393298

[PATCH v3 04/11] arm: tegra: set critical trips for Tegra124

From Wei Ni <wni@nvidia.com>
Newsgroups linux.kernel
Subject [PATCH v3 04/11] arm: tegra: set critical trips for Tegra124
Date 2016-05-03 12:20 +0200
Message-ID <ruFAT-6ok-51@gated-at.bofh.it> (permalink)
References <ruFAS-6ok-5@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


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>
---
 arch/arm/boot/dts/tegra124-jetson-tk1.dts | 18 ++--------
 arch/arm/boot/dts/tegra124.dtsi           | 60 +++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 15 deletions(-)

diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
index 941f36263c8f..40ad62c9c62e 100644
--- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
@@ -2049,44 +2049,32 @@
 	thermal-zones {
 		cpu {
 			trips {
-				trip@0 {
+				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@0 {
+				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@0 {
+				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 ea4811870de2..08c7f85ea2c8 100644
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -1149,6 +1149,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 {
@@ -1157,6 +1172,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 {
@@ -1165,6 +1195,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 {
@@ -1173,6 +1218,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.
+				 */
+			};
 		};
 	};
 
-- 
1.9.1

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH v3 00/11] Add HW throttle for Tegra soctherm Wei Ni <wni@nvidia.com> - 2016-05-03 12:20 +0200
  [PATCH v3 05/11] arm: tegra: set hot trips for Tegra124 Wei Ni <wni@nvidia.com> - 2016-05-03 12:20 +0200
  [PATCH v3 09/11] arm64: tegra: add soctherm node for Tegra210 Wei Ni <wni@nvidia.com> - 2016-05-03 12:20 +0200
  [PATCH v3 01/11] of: Add bindings of hw throttle for Tegra soctherm Wei Ni <wni@nvidia.com> - 2016-05-03 12:20 +0200
    Re: [PATCH v3 01/11] of: Add bindings of hw throttle for Tegra  soctherm Rob Herring <robh@kernel.org> - 2016-05-04 15:40 +0200
      Re: [PATCH v3 01/11] of: Add bindings of hw throttle for Tegra soctherm Wei Ni <wni@nvidia.com> - 2016-05-05 05:30 +0200
  [PATCH v3 03/11] thermal: tegra: add hw-throttle for Tegra132 Wei Ni <wni@nvidia.com> - 2016-05-03 12:20 +0200
  [PATCH v3 11/11] arm64: tegra: set hot trips for Tegra210 Wei Ni <wni@nvidia.com> - 2016-05-03 12:20 +0200
  [PATCH v3 08/11] arm64: tegra: set hot trips for Tegra132 Wei Ni <wni@nvidia.com> - 2016-05-03 12:20 +0200
  [PATCH v3 04/11] arm: tegra: set critical trips for Tegra124 Wei Ni <wni@nvidia.com> - 2016-05-03 12:20 +0200
  [PATCH v3 07/11] arm64: tegra: set critical trips for Tegra132 Wei Ni <wni@nvidia.com> - 2016-05-03 12:20 +0200
  [PATCH v3 02/11] thermal: tegra: add hw-throttle function Wei Ni <wni@nvidia.com> - 2016-05-03 12:20 +0200

csiph-web