arm64: dts: renesas: Fix thermal bindings

[ 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>

diff --git a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
index 6f4fffa..e70aa5a 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 0f7bdfc..6c5694f 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 379a130..62209ab 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 1768a3e..193d81b 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 2bd8169..b526e4f 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 041473a..21fc953 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 08df756..f9679a4 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 6347d15..21fe602 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 631d520..26899fb 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>;