Skip to content

L
linux
Commit fe57ff53 authored by Thierry Reding's avatar Thierry Reding
Browse files
Options

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: default avatarThierry Reding <treding@nvidia.com>
parent fce5d073
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 55 deletions
arch/arm64/boot/dts/nvidia/tegra132.dtsi
View file @ fe57ff53
......@@ -895,7 +895,7 @@ throttle_heavy: heavy {
};
thermal-zones {
cpu {
cpu-thermal {
polling-delay-passive = <1000>;
polling-delay = <0>;
......@@ -923,7 +923,8 @@ map0 {
};
};
};
mem {
mem-thermal {
polling-delay-passive = <0>;
polling-delay = <0>;
......@@ -950,7 +951,8 @@ cooling-maps {
*/
};
};
gpu {
gpu-thermal {
polling-delay-passive = <1000>;
polling-delay = <0>;
......@@ -978,7 +980,8 @@ map0 {
};
};
};
pllx {
pllx-thermal {
polling-delay-passive = <0>;
polling-delay = <0>;
......
arch/arm64/boot/dts/nvidia/tegra186-p3509-0000+p3636-0001.dts
View file @ fe57ff53
......@@ -633,7 +633,7 @@ vdd_hdmi: regulator-vdd-hdmi {
};
thermal-zones {
cpu {
cpu-thermal {
polling-delay = <0>;
polling-delay-passive = <500>;
status = "okay";
......@@ -687,28 +687,28 @@ cpu-passive {
};
};
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";
};
......
arch/arm64/boot/dts/nvidia/tegra186.dtsi
View file @ fe57ff53
......@@ -1976,12 +1976,12 @@ sound {
};
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 @@ cooling-maps {
};
};
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 @@ cooling-maps {
};
};
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 @@ cooling-maps {
};
};
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 @@ cooling-maps {
};
};
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 {
......
arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts
View file @ fe57ff53
......@@ -2097,7 +2097,7 @@ sound {
};
thermal-zones {
cpu {
cpu-thermal {
polling-delay = <0>;
polling-delay-passive = <500>;
status = "okay";
......@@ -2151,7 +2151,7 @@ cpu-passive {
};
};
gpu {
gpu-thermal {
polling-delay = <0>;
polling-delay-passive = <500>;
status = "okay";
......@@ -2165,7 +2165,7 @@ gpu_alert0: critical {
};
};
aux {
aux-thermal {
polling-delay = <0>;
polling-delay-passive = <500>;
status = "okay";
......
arch/arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi
View file @ fe57ff53
......@@ -2103,7 +2103,7 @@ sound {
};
thermal-zones {
cpu {
cpu-thermal {
polling-delay = <0>;
polling-delay-passive = <500>;
status = "okay";
......@@ -2157,7 +2157,7 @@ cpu-passive {
};
};
gpu {
gpu-thermal {
polling-delay = <0>;
polling-delay-passive = <500>;
status = "okay";
......@@ -2171,7 +2171,7 @@ gpu_alert0: critical {
};
};
aux {
aux-thermal {
polling-delay = <0>;
polling-delay-passive = <500>;
status = "okay";
......
arch/arm64/boot/dts/nvidia/tegra194.dtsi
View file @ fe57ff53
......@@ -2903,39 +2903,33 @@ tcu: tcu {
};
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";
};
};
......
arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts
View file @ fe57ff53
......@@ -1684,7 +1684,7 @@ fan: fan {
};
thermal-zones {
cpu {
cpu-thermal {
trips {
cpu_trip_critical: critical {
temperature = <96500>;
......
arch/arm64/boot/dts/nvidia/tegra210.dtsi
View file @ fe57ff53
......@@ -1981,7 +1981,7 @@ sound {
};
thermal-zones {
cpu {
cpu-thermal {
polling-delay-passive = <1000>;
polling-delay = <0>;
......@@ -2010,7 +2010,7 @@ map0 {
};
};
mem {
mem-thermal {
polling-delay-passive = <0>;
polling-delay = <0>;
......@@ -2056,7 +2056,7 @@ dram-active {
};
};
gpu {
gpu-thermal {
polling-delay-passive = <1000>;
polling-delay = <0>;
......@@ -2085,7 +2085,7 @@ map0 {
};
};
pllx {
pllx-thermal {
polling-delay-passive = <0>;
polling-delay = <0>;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7