Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751639AbcC3KaK (ORCPT <rfc822;w@1wt.eu>);
	Wed, 30 Mar 2016 06:30:10 -0400
Received: from nat-hk.nvidia.com ([203.18.50.4]:14573 "EHLO
	hkmmgate101.nvidia.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org
	with ESMTP id S1751223AbcC3KaI convert rfc822-to-8bit (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Wed, 30 Mar 2016 06:30:08 -0400
X-PGP-Universal: processed;
	by hkpgpgate101.nvidia.com on Wed, 30 Mar 2016 03:30:05 -0700
Message-ID: <56FBAAC8.1090208@nvidia.com>
Date: Wed, 30 Mar 2016 18:30:32 +0800
From: Wei Ni <wni@nvidia.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0
MIME-Version: 1.0
To: <robh+dt@kernel.org>, Thierry Reding <thierry.reding@gmail.com>
CC: <edubezval@gmail.com>, <rui.zhang@intel.com>, <MLongnecker@nvidia.com>,
        <swarren@wwwdotorg.org>, <mikko.perttunen@kapsi.fi>,
        <linux-tegra@vger.kernel.org>, <linux-pm@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH V9 RESEND 14/14] arm: tegra: set critical trips for Tegra124
References: <1459247364-1139-1-git-send-email-wni@nvidia.com> <1459247364-1139-15-git-send-email-wni@nvidia.com>
In-Reply-To: <1459247364-1139-15-git-send-email-wni@nvidia.com>
X-Originating-IP: [10.19.224.146]
X-ClientProxiedBy: HKMAIL104.nvidia.com (10.18.16.13) To HKMAIL101.nvidia.com
 (10.18.16.10)
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8BIT
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 3704
Lines: 161

To: Rob Herring <robh+dt@kernel.org>


On 2016年03月29日 18:29, Wei Ni wrote:
> 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.
> +				 */
> +			};
>  		};
>  	};
>  
>