arm64: dts: hisilicon: normalize the node name of the module thermal

1. Change the node name of the thermal zone to match
'^[a-zA-Z][a-zA-Z0-9\\-]{1,12}-thermal$', add suffix "-thermal".
2. Change the node name of the trip point to match
'^[a-zA-Z][a-zA-Z0-9\\-_]{0,63}$', delete character "@".

Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>

diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
index 49c19c6879f95ce97e7dc7d2cd4512ef1f4a348c..cab89dc6f59612167865d47338a04b70e2c1d53d 100644 (file)
--- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
@@ -1113,7 +1113,7 @@
 
                thermal-zones {
 
-                       cls0: cls0 {
+                       cls0: cls0-thermal {
                                polling-delay = <1000>;
                                polling-delay-passive = <100>;
                                sustainable-power = <4500>;
@@ -1122,13 +1122,13 @@
                                thermal-sensors = <&tsensor 1>;
 
                                trips {
-                                       threshold: trip-point@0 {
+                                       threshold: trip-point0 {
                                                temperature = <65000>;
                                                hysteresis = <1000>;
                                                type = "passive";
                                        };
 
-                                       target: trip-point@1 {
+                                       target: trip-point1 {
                                                temperature = <75000>;
                                                hysteresis = <1000>;
                                                type = "passive";

diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
index f9953303a3f44dce5b6845f5686fb42b1dd82294..d426c6c8722b307558a4168f0f2dbba17c6c7bfc 100644 (file)
--- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
@@ -872,7 +872,7 @@
 
                thermal-zones {
 
-                       cls0: cls0 {
+                       cls0: cls0-thermal {
                                polling-delay = <1000>;
                                polling-delay-passive = <100>;
                                sustainable-power = <3326>;
@@ -881,13 +881,13 @@
                                thermal-sensors = <&tsensor 2>;
 
                                trips {
-                                       threshold: trip-point@0 {
+                                       threshold: trip-point0 {
                                                temperature = <65000>;
                                                hysteresis = <0>;
                                                type = "passive";
                                        };
 
-                                       target: trip-point@1 {
+                                       target: trip-point1 {
                                                temperature = <75000>;
                                                hysteresis = <0>;
                                                type = "passive";