projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2f80482)
arm64: dts: renesas: Fix thermal bindings
authorKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Thu, 4 Nov 2021 22:40:25 +0000 (22:40 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 27 Jan 2022 10:04:36 +0000 (11:04 +0100)
[ Upstream commit 82ce79391d0ec25ec8aaae3c0617b71048ff0836 ]

The binding node names for the thermal zones are not successfully
validated by the dt-schemas.

Fix the validation by changing from sensor-thermalN or thermal-sensor-N
to sensorN-thermal.  Provide node labels of the form sensorN_thermal to
ensure consistency with the other platform implementations.

Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Link: https://lore.kernel.org/r/20211104224033.3997504-1-kieran.bingham+renesas@ideasonboard.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/arm64/boot/dts/renesas/r8a774a1.dtsi patch | blob | history
arch/arm64/boot/dts/renesas/r8a774b1.dtsi patch | blob | history
arch/arm64/boot/dts/renesas/r8a774e1.dtsi patch | blob | history
arch/arm64/boot/dts/renesas/r8a77951.dtsi patch | blob | history
arch/arm64/boot/dts/renesas/r8a77960.dtsi patch | blob | history
arch/arm64/boot/dts/renesas/r8a77961.dtsi patch | blob | history
arch/arm64/boot/dts/renesas/r8a77965.dtsi patch | blob | history
arch/arm64/boot/dts/renesas/r8a77980.dtsi patch | blob | history
arch/arm64/boot/dts/renesas/r8a779a0.dtsi patch | blob | history

diff --git a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
index 6f4fffacfca21b7f6f9759a9643e151a2929f6ec..e70aa5a0874027b94f925c579cc1f7c006437353 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
@@ -2784,7 +2784,7 @@
        };
 
        thermal-zones {
-               sensor_thermal1: sensor-thermal1 {
+               sensor1_thermal: sensor1-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 0>;
@@ -2799,7 +2799,7 @@
                        };
                };
 
-               sensor_thermal2: sensor-thermal2 {
+               sensor2_thermal: sensor2-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 1>;
@@ -2814,7 +2814,7 @@
                        };
                };
 
-               sensor_thermal3: sensor-thermal3 {
+               sensor3_thermal: sensor3-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 2>;
diff --git a/arch/arm64/boot/dts/renesas/r8a774b1.dtsi b/arch/arm64/boot/dts/renesas/r8a774b1.dtsi
index 0f7bdfc90a0dc325dbd0d712658b580a01e16f69..6c5694fa6690072170d520d51f4fd9ac3bcf122f 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a774b1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a774b1.dtsi
@@ -2629,7 +2629,7 @@
        };
 
        thermal-zones {
-               sensor_thermal1: sensor-thermal1 {
+               sensor1_thermal: sensor1-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 0>;
@@ -2644,7 +2644,7 @@
                        };
                };
 
-               sensor_thermal2: sensor-thermal2 {
+               sensor2_thermal: sensor2-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 1>;
@@ -2659,7 +2659,7 @@
                        };
                };
 
-               sensor_thermal3: sensor-thermal3 {
+               sensor3_thermal: sensor3-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 2>;
diff --git a/arch/arm64/boot/dts/renesas/r8a774e1.dtsi b/arch/arm64/boot/dts/renesas/r8a774e1.dtsi
index 379a1300272ba3f11a9fd3ea9a98415186877d86..62209ab6deb9a98a8c8e9adc0aa6636bea76e707 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a774e1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a774e1.dtsi
@@ -2904,7 +2904,7 @@
        };
 
        thermal-zones {
-               sensor_thermal1: sensor-thermal1 {
+               sensor1_thermal: sensor1-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 0>;
@@ -2919,7 +2919,7 @@
                        };
                };
 
-               sensor_thermal2: sensor-thermal2 {
+               sensor2_thermal: sensor2-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 1>;
@@ -2934,7 +2934,7 @@
                        };
                };
 
-               sensor_thermal3: sensor-thermal3 {
+               sensor3_thermal: sensor3-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 2>;
diff --git a/arch/arm64/boot/dts/renesas/r8a77951.dtsi b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
index 1768a3e6bb8da6a12340f91b59fb4c41132abdd1..193d81be40fc4936c4442047eaeabc462ff51d47 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a77951.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
@@ -3375,7 +3375,7 @@
        };
 
        thermal-zones {
-               sensor_thermal1: sensor-thermal1 {
+               sensor1_thermal: sensor1-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 0>;
@@ -3390,7 +3390,7 @@
                        };
                };
 
-               sensor_thermal2: sensor-thermal2 {
+               sensor2_thermal: sensor2-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 1>;
@@ -3405,7 +3405,7 @@
                        };
                };
 
-               sensor_thermal3: sensor-thermal3 {
+               sensor3_thermal: sensor3-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 2>;
diff --git a/arch/arm64/boot/dts/renesas/r8a77960.dtsi b/arch/arm64/boot/dts/renesas/r8a77960.dtsi
index 2bd8169735d351b207ba0e39740d6bb27e0a3954..b526e4f0ee6a8d84d18e3451cb0e92ddac70ac5f 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a77960.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77960.dtsi
@@ -2972,7 +2972,7 @@
        };
 
        thermal-zones {
-               sensor_thermal1: sensor-thermal1 {
+               sensor1_thermal: sensor1-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 0>;
@@ -2987,7 +2987,7 @@
                        };
                };
 
-               sensor_thermal2: sensor-thermal2 {
+               sensor2_thermal: sensor2-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 1>;
@@ -3002,7 +3002,7 @@
                        };
                };
 
-               sensor_thermal3: sensor-thermal3 {
+               sensor3_thermal: sensor3-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 2>;
diff --git a/arch/arm64/boot/dts/renesas/r8a77961.dtsi b/arch/arm64/boot/dts/renesas/r8a77961.dtsi
index 041473aa5cd09efb694c21ea9eba0fec3dc7717b..21fc95397c3c267621a20d05bbf447e3b0e25949 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a77961.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77961.dtsi
@@ -2719,7 +2719,7 @@
        };
 
        thermal-zones {
-               sensor_thermal1: sensor-thermal1 {
+               sensor1_thermal: sensor1-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 0>;
@@ -2734,7 +2734,7 @@
                        };
                };
 
-               sensor_thermal2: sensor-thermal2 {
+               sensor2_thermal: sensor2-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 1>;
@@ -2749,7 +2749,7 @@
                        };
                };
 
-               sensor_thermal3: sensor-thermal3 {
+               sensor3_thermal: sensor3-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 2>;
diff --git a/arch/arm64/boot/dts/renesas/r8a77965.dtsi b/arch/arm64/boot/dts/renesas/r8a77965.dtsi
index 08df75606430bd4af88760025ee799dac2b46ec0..f9679a4dd85fae45e05b6b35b023a48d667ece2c 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a77965.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77965.dtsi
@@ -2784,7 +2784,7 @@
        };
 
        thermal-zones {
-               sensor_thermal1: sensor-thermal1 {
+               sensor1_thermal: sensor1-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 0>;
@@ -2799,7 +2799,7 @@
                        };
                };
 
-               sensor_thermal2: sensor-thermal2 {
+               sensor2_thermal: sensor2-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 1>;
@@ -2814,7 +2814,7 @@
                        };
                };
 
-               sensor_thermal3: sensor-thermal3 {
+               sensor3_thermal: sensor3-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 2>;
diff --git a/arch/arm64/boot/dts/renesas/r8a77980.dtsi b/arch/arm64/boot/dts/renesas/r8a77980.dtsi
index 6347d15e66b64f19b549009c95f3bc63e8b6d9e4..21fe602bd25afa8dbf8304719c86f52cdbac2276 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a77980.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77980.dtsi
@@ -1580,7 +1580,7 @@
        };
 
        thermal-zones {
-               thermal-sensor-1 {
+               sensor1_thermal: sensor1-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 0>;
@@ -1599,7 +1599,7 @@
                        };
                };
 
-               thermal-sensor-2 {
+               sensor2_thermal: sensor2-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 1>;
diff --git a/arch/arm64/boot/dts/renesas/r8a779a0.dtsi b/arch/arm64/boot/dts/renesas/r8a779a0.dtsi
index 631d520cebee59b45c74c2716e23757fc6bc3219..26899fb768a739883d56ed74977db055e623a6b5 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a779a0.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a779a0.dtsi
@@ -1149,7 +1149,7 @@
        };
 
        thermal-zones {
-               sensor_thermal1: sensor-thermal1 {
+               sensor1_thermal: sensor1-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 0>;
@@ -1163,7 +1163,7 @@
                        };
                };
 
-               sensor_thermal2: sensor-thermal2 {
+               sensor2_thermal: sensor2-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 1>;
@@ -1177,7 +1177,7 @@
                        };
                };
 
-               sensor_thermal3: sensor-thermal3 {
+               sensor3_thermal: sensor3-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 2>;
@@ -1191,7 +1191,7 @@
                        };
                };
 
-               sensor_thermal4: sensor-thermal4 {
+               sensor4_thermal: sensor4-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 3>;
@@ -1205,7 +1205,7 @@
                        };
                };
 
-               sensor_thermal5: sensor-thermal5 {
+               sensor5_thermal: sensor5-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
                        thermal-sensors = <&tsc 4>;
Domain: System / Kernel;