To: Rob Herring <robh...@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 <w...@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. > + */ > + }; > }; > }; > >