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