ARM: tegra: Rename thermal zone nodes

The DT schema requires that nodes representing thermal zones include a
"-thermal" suffix in their name.

Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
index b952b272afc000a28577d21b80333534fcc35fe9..f5440ae14cb4e7f107d32c16b19853ec19d12407 100644 (file)
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
@@ -2024,7 +2024,7 @@
        };
 
        thermal-zones {
-               cpu {
+               cpu-thermal {
                        trips {
                                cpu-shutdown-trip {
                                        temperature = <101000>;
@@ -2034,7 +2034,7 @@
                        };
                };
 
-               mem {
+               mem-thermal {
                        trips {
                                mem-shutdown-trip {
                                        temperature = <101000>;
@@ -2044,7 +2044,7 @@
                        };
                };
 
-               gpu {
+               gpu-thermal {
                        trips {
                                gpu-shutdown-trip {
                                        temperature = <101000>;

diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi
index 2b1bb4382b42467467d308d8ed6c7f335cd04cbe..1d83f2e254c582f56d65f9bc506b75c5e5a6b7ec 100644 (file)
--- a/arch/arm/boot/dts/tegra124-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
@@ -2016,7 +2016,7 @@
        };
 
        thermal-zones {
-               cpu {
+               cpu-thermal {
                        trips {
                                cpu-shutdown-trip {
                                        temperature = <101000>;
@@ -2026,7 +2026,7 @@
                        };
                };
 
-               mem {
+               mem-thermal {
                        trips {
                                mem-shutdown-trip {
                                        temperature = <101000>;
@@ -2036,7 +2036,7 @@
                        };
                };
 
-               gpu {
+               gpu-thermal {
                        trips {
                                gpu-shutdown-trip {
                                        temperature = <101000>;

diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
index e805cb2e20f495775ea8e28a0110c4fe7960e24c..28b889e4e33bbc29433a33dd14542c6073e361b4 100644 (file)
--- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
@@ -2047,7 +2047,7 @@
        };
 
        thermal-zones {
-               cpu {
+               cpu-thermal {
                        trips {
                                cpu-shutdown-trip {
                                        temperature = <101000>;
@@ -2057,7 +2057,7 @@
                        };
                };
 
-               mem {
+               mem-thermal {
                        trips {
                                mem-shutdown-trip {
                                        temperature = <101000>;
@@ -2067,7 +2067,7 @@
                        };
                };
 
-               gpu {
+               gpu-thermal {
                        trips {
                                gpu-shutdown-trip {
                                        temperature = <101000>;

diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
index d0ec1a30ff54bcc6a68b52bf628eb969d267e457..752a28268024ea1e5cc0cf1c22bcbe06877d0aa4 100644 (file)
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -1242,7 +1242,7 @@
        };
 
        thermal-zones {
-               cpu {
+               cpu-thermal {
                        polling-delay-passive = <1000>;
                        polling-delay = <1000>;
 
@@ -1270,7 +1270,7 @@
                        };
                };
 
-               mem {
+               mem-thermal {
                        polling-delay-passive = <1000>;
                        polling-delay = <1000>;
 
@@ -1298,7 +1298,7 @@
                        };
                };
 
-               gpu {
+               gpu-thermal {
                        polling-delay-passive = <1000>;
                        polling-delay = <1000>;
 
@@ -1326,7 +1326,7 @@
                        };
                };
 
-               pllx {
+               pllx-thermal {
                        polling-delay-passive = <1000>;
                        polling-delay = <1000>;