提交 fe57ff53 编写于 作者: T Thierry Reding

arm64: tegra: Rename thermal zones nodes

The DT schema requires that nodes representing thermal zones include a
"-thermal" suffix in their name.
Signed-off-by: NThierry Reding <treding@nvidia.com>
上级 fce5d073
...@@ -895,7 +895,7 @@ ...@@ -895,7 +895,7 @@
}; };
thermal-zones { thermal-zones {
cpu { cpu-thermal {
polling-delay-passive = <1000>; polling-delay-passive = <1000>;
polling-delay = <0>; polling-delay = <0>;
...@@ -923,7 +923,8 @@ ...@@ -923,7 +923,8 @@
}; };
}; };
}; };
mem {
mem-thermal {
polling-delay-passive = <0>; polling-delay-passive = <0>;
polling-delay = <0>; polling-delay = <0>;
...@@ -950,7 +951,8 @@ ...@@ -950,7 +951,8 @@
*/ */
}; };
}; };
gpu {
gpu-thermal {
polling-delay-passive = <1000>; polling-delay-passive = <1000>;
polling-delay = <0>; polling-delay = <0>;
...@@ -978,7 +980,8 @@ ...@@ -978,7 +980,8 @@
}; };
}; };
}; };
pllx {
pllx-thermal {
polling-delay-passive = <0>; polling-delay-passive = <0>;
polling-delay = <0>; polling-delay = <0>;
......
...@@ -633,7 +633,7 @@ ...@@ -633,7 +633,7 @@
}; };
thermal-zones { thermal-zones {
cpu { cpu-thermal {
polling-delay = <0>; polling-delay = <0>;
polling-delay-passive = <500>; polling-delay-passive = <500>;
status = "okay"; status = "okay";
...@@ -687,28 +687,28 @@ ...@@ -687,28 +687,28 @@
}; };
}; };
gpu { aux-thermal {
polling-delay = <0>; polling-delay = <0>;
polling-delay-passive = <500>; polling-delay-passive = <500>;
status = "okay"; status = "okay";
trips { trips {
gpu_alert0: critical { aux_alert0: critical {
temperature = <99000>; temperature = <90000>;
hysteresis = <0>; hysteresis = <0>;
type = "critical"; type = "critical";
}; };
}; };
}; };
aux { gpu-thermal {
polling-delay = <0>; polling-delay = <0>;
polling-delay-passive = <500>; polling-delay-passive = <500>;
status = "okay"; status = "okay";
trips { trips {
aux_alert0: critical { gpu_alert0: critical {
temperature = <90000>; temperature = <99000>;
hysteresis = <0>; hysteresis = <0>;
type = "critical"; type = "critical";
}; };
......
...@@ -1976,12 +1976,12 @@ ...@@ -1976,12 +1976,12 @@
}; };
thermal-zones { thermal-zones {
a57 { /* Cortex-A57 cluster */
cpu-thermal {
polling-delay = <0>; polling-delay = <0>;
polling-delay-passive = <1000>; polling-delay-passive = <1000>;
thermal-sensors = thermal-sensors = <&bpmp_thermal TEGRA186_BPMP_THERMAL_ZONE_CPU>;
<&bpmp_thermal TEGRA186_BPMP_THERMAL_ZONE_CPU>;
trips { trips {
critical { critical {
...@@ -1995,12 +1995,12 @@ ...@@ -1995,12 +1995,12 @@
}; };
}; };
denver { /* Denver cluster */
aux-thermal {
polling-delay = <0>; polling-delay = <0>;
polling-delay-passive = <1000>; polling-delay-passive = <1000>;
thermal-sensors = thermal-sensors = <&bpmp_thermal TEGRA186_BPMP_THERMAL_ZONE_AUX>;
<&bpmp_thermal TEGRA186_BPMP_THERMAL_ZONE_AUX>;
trips { trips {
critical { critical {
...@@ -2014,12 +2014,11 @@ ...@@ -2014,12 +2014,11 @@
}; };
}; };
gpu { gpu-thermal {
polling-delay = <0>; polling-delay = <0>;
polling-delay-passive = <1000>; polling-delay-passive = <1000>;
thermal-sensors = thermal-sensors = <&bpmp_thermal TEGRA186_BPMP_THERMAL_ZONE_GPU>;
<&bpmp_thermal TEGRA186_BPMP_THERMAL_ZONE_GPU>;
trips { trips {
critical { critical {
...@@ -2033,12 +2032,11 @@ ...@@ -2033,12 +2032,11 @@
}; };
}; };
pll { pll-thermal {
polling-delay = <0>; polling-delay = <0>;
polling-delay-passive = <1000>; polling-delay-passive = <1000>;
thermal-sensors = thermal-sensors = <&bpmp_thermal TEGRA186_BPMP_THERMAL_ZONE_PLLX>;
<&bpmp_thermal TEGRA186_BPMP_THERMAL_ZONE_PLLX>;
trips { trips {
critical { critical {
...@@ -2052,12 +2050,11 @@ ...@@ -2052,12 +2050,11 @@
}; };
}; };
always_on { ao-thermal {
polling-delay = <0>; polling-delay = <0>;
polling-delay-passive = <1000>; polling-delay-passive = <1000>;
thermal-sensors = thermal-sensors = <&bpmp_thermal TEGRA186_BPMP_THERMAL_ZONE_AO>;
<&bpmp_thermal TEGRA186_BPMP_THERMAL_ZONE_AO>;
trips { trips {
critical { critical {
......
...@@ -2097,7 +2097,7 @@ ...@@ -2097,7 +2097,7 @@
}; };
thermal-zones { thermal-zones {
cpu { cpu-thermal {
polling-delay = <0>; polling-delay = <0>;
polling-delay-passive = <500>; polling-delay-passive = <500>;
status = "okay"; status = "okay";
...@@ -2151,7 +2151,7 @@ ...@@ -2151,7 +2151,7 @@
}; };
}; };
gpu { gpu-thermal {
polling-delay = <0>; polling-delay = <0>;
polling-delay-passive = <500>; polling-delay-passive = <500>;
status = "okay"; status = "okay";
...@@ -2165,7 +2165,7 @@ ...@@ -2165,7 +2165,7 @@
}; };
}; };
aux { aux-thermal {
polling-delay = <0>; polling-delay = <0>;
polling-delay-passive = <500>; polling-delay-passive = <500>;
status = "okay"; status = "okay";
......
...@@ -2103,7 +2103,7 @@ ...@@ -2103,7 +2103,7 @@
}; };
thermal-zones { thermal-zones {
cpu { cpu-thermal {
polling-delay = <0>; polling-delay = <0>;
polling-delay-passive = <500>; polling-delay-passive = <500>;
status = "okay"; status = "okay";
...@@ -2157,7 +2157,7 @@ ...@@ -2157,7 +2157,7 @@
}; };
}; };
gpu { gpu-thermal {
polling-delay = <0>; polling-delay = <0>;
polling-delay-passive = <500>; polling-delay-passive = <500>;
status = "okay"; status = "okay";
...@@ -2171,7 +2171,7 @@ ...@@ -2171,7 +2171,7 @@
}; };
}; };
aux { aux-thermal {
polling-delay = <0>; polling-delay = <0>;
polling-delay-passive = <500>; polling-delay-passive = <500>;
status = "okay"; status = "okay";
......
...@@ -2903,39 +2903,33 @@ ...@@ -2903,39 +2903,33 @@
}; };
thermal-zones { thermal-zones {
cpu { cpu-thermal {
thermal-sensors = <&{/bpmp/thermal} thermal-sensors = <&{/bpmp/thermal} TEGRA194_BPMP_THERMAL_ZONE_CPU>;
TEGRA194_BPMP_THERMAL_ZONE_CPU>;
status = "disabled"; status = "disabled";
}; };
gpu { gpu-thermal {
thermal-sensors = <&{/bpmp/thermal} thermal-sensors = <&{/bpmp/thermal} TEGRA194_BPMP_THERMAL_ZONE_GPU>;
TEGRA194_BPMP_THERMAL_ZONE_GPU>;
status = "disabled"; status = "disabled";
}; };
aux { aux-thermal {
thermal-sensors = <&{/bpmp/thermal} thermal-sensors = <&{/bpmp/thermal} TEGRA194_BPMP_THERMAL_ZONE_AUX>;
TEGRA194_BPMP_THERMAL_ZONE_AUX>;
status = "disabled"; status = "disabled";
}; };
pllx { pllx-thermal {
thermal-sensors = <&{/bpmp/thermal} thermal-sensors = <&{/bpmp/thermal} TEGRA194_BPMP_THERMAL_ZONE_PLLX>;
TEGRA194_BPMP_THERMAL_ZONE_PLLX>;
status = "disabled"; status = "disabled";
}; };
ao { ao-thermal {
thermal-sensors = <&{/bpmp/thermal} thermal-sensors = <&{/bpmp/thermal} TEGRA194_BPMP_THERMAL_ZONE_AO>;
TEGRA194_BPMP_THERMAL_ZONE_AO>;
status = "disabled"; status = "disabled";
}; };
tj { tj-thermal {
thermal-sensors = <&{/bpmp/thermal} thermal-sensors = <&{/bpmp/thermal} TEGRA194_BPMP_THERMAL_ZONE_TJ_MAX>;
TEGRA194_BPMP_THERMAL_ZONE_TJ_MAX>;
status = "disabled"; status = "disabled";
}; };
}; };
......
...@@ -1684,7 +1684,7 @@ ...@@ -1684,7 +1684,7 @@
}; };
thermal-zones { thermal-zones {
cpu { cpu-thermal {
trips { trips {
cpu_trip_critical: critical { cpu_trip_critical: critical {
temperature = <96500>; temperature = <96500>;
......
...@@ -1981,7 +1981,7 @@ ...@@ -1981,7 +1981,7 @@
}; };
thermal-zones { thermal-zones {
cpu { cpu-thermal {
polling-delay-passive = <1000>; polling-delay-passive = <1000>;
polling-delay = <0>; polling-delay = <0>;
...@@ -2010,7 +2010,7 @@ ...@@ -2010,7 +2010,7 @@
}; };
}; };
mem { mem-thermal {
polling-delay-passive = <0>; polling-delay-passive = <0>;
polling-delay = <0>; polling-delay = <0>;
...@@ -2056,7 +2056,7 @@ ...@@ -2056,7 +2056,7 @@
}; };
}; };
gpu { gpu-thermal {
polling-delay-passive = <1000>; polling-delay-passive = <1000>;
polling-delay = <0>; polling-delay = <0>;
...@@ -2085,7 +2085,7 @@ ...@@ -2085,7 +2085,7 @@
}; };
}; };
pllx { pllx-thermal {
polling-delay-passive = <0>; polling-delay-passive = <0>;
polling-delay = <0>; polling-delay = <0>;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册