Commit fe57ff53 authored by Thierry Reding's avatar Thierry Reding
Browse files

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
Loading
Loading
Loading
Loading
+7 −4
Original line number Diff line number Diff line
@@ -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>;

+7 −7
Original line number Diff line number Diff line
@@ -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";
				};
+12 −15
Original line number Diff line number Diff line
@@ -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 {
+3 −3
Original line number Diff line number Diff line
@@ -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";
+3 −3
Original line number Diff line number Diff line
@@ -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";
Loading