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


Groups > linux.kernel > #1366136

[PATCH V9 RESEND 14/14] arm: tegra: set critical trips for Tegra124

From Wei Ni <wni@nvidia.com>
Newsgroups linux.kernel
Subject [PATCH V9 RESEND 14/14] arm: tegra: set critical trips for Tegra124
Date 2016-03-29 12:40 +0200
Message-ID <rhZe3-4MC-43@gated-at.bofh.it> (permalink)
References <rhZ4m-4HB-9@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 66b4451eb2ca..0e24ecd71ac7 100644
--- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
@@ -1931,44 +1931,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 68669f791c8b..076a384848ba 100644
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -996,6 +996,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 {
@@ -1004,6 +1019,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 {
@@ -1012,6 +1042,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 {
@@ -1020,6 +1065,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 V9 RESEND 00/14] Add T210 support in Tegra soctherm Wei Ni <wni@nvidia.com> - 2016-03-29 12:30 +0200
  [PATCH V9 RESEND 06/14] thermal: tegra: add a debugfs to show registers Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
  Re: [PATCH V9 RESEND 00/14] Add T210 support in Tegra soctherm Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
    Re: [PATCH V9 RESEND 00/14] Add T210 support in Tegra soctherm Eduardo Valentin <edubezval@gmail.com> - 2016-03-29 17:20 +0200
  [PATCH V9 RESEND 03/14] thermal: tegra: get rid of PDIV/HOTSPOT hack Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
  [PATCH V9 RESEND 13/14] arm64: tegra: add soctherm node for Tegra210 Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
    Re: [PATCH V9 RESEND 13/14] arm64: tegra: add soctherm node for  Tegra210 Eduardo Valentin <edubezval@gmail.com> - 2016-03-29 17:20 +0200
      Re: [PATCH V9 RESEND 13/14] arm64: tegra: add soctherm node for Tegra210 Wei Ni <wni@nvidia.com> - 2016-03-30 05:30 +0200
        Re: [PATCH V9 RESEND 13/14] arm64: tegra: add soctherm node for Tegra210 Wei Ni <wni@nvidia.com> - 2016-03-30 12:30 +0200
      Re: [PATCH V9 RESEND 13/14] arm64: tegra: add soctherm node for Tegra210 Wei Ni <wni@nvidia.com> - 2016-04-01 09:10 +0200
  [PATCH V9 RESEND 02/14] thermal: tegra: combine sensor group-related data Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
  [PATCH V9 RESEND 11/14] thermal: tegra: handle HW initialization in one funcotion Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
  [PATCH V9 RESEND 07/14] thermal: of-thermal: allow setting trip_temp on hardware Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
  [PATCH V9 RESEND 01/14] thermal: tegra: move tegra thermal files into tegra directory Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
  [PATCH V9 RESEND 05/14] thermal: tegra: add Tegra210 specific SOC_THERM driver Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
  [PATCH V9 RESEND 09/14] thermal: tegra: add thermtrip function Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
  [PATCH V9 RESEND 10/14] thermal: tegra: handle clocks in one function Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
  [PATCH V9 RESEND 14/14] arm: tegra: set critical trips for Tegra124 Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
    Re: [PATCH V9 RESEND 14/14] arm: tegra: set critical trips for  Tegra124 Eduardo Valentin <edubezval@gmail.com> - 2016-03-29 17:20 +0200
      Re: [PATCH V9 RESEND 14/14] arm: tegra: set critical trips for Tegra124 Wei Ni <wni@nvidia.com> - 2016-04-01 09:10 +0200
    Re: [PATCH V9 RESEND 14/14] arm: tegra: set critical trips for Tegra124 Wei Ni <wni@nvidia.com> - 2016-03-30 12:40 +0200
  [PATCH V9 RESEND 12/14] thermal: tegra: add PM support Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
  [PATCH V9 RESEND 08/14] of: add notes of critical trips for soctherm Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
  Re: [PATCH V9 RESEND 00/14] Add T210 support in Tegra soctherm Eduardo Valentin <edubezval@gmail.com> - 2016-03-29 17:20 +0200

csiph-web