arm64: dts: qcom: replace underscores in node names

Underscores should not be used in node names (dtc with W=2 warns about
them), so replace them with hyphens.  In few places adjust the name to
match other nodes (e.g. xxx-regulator).

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221214110448.86268-1-krzysztof.kozlowski@linaro.org

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 2f9a486..7458387 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -1999,7 +1999,7 @@
                                        hysteresis = <2000>;
                                        type = "passive";
                                };
-                               cpu0_1_crit: cpu_crit {
+                               cpu0_1_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -2029,7 +2029,7 @@
                                        hysteresis = <2000>;
                                        type = "passive";
                                };
-                               cpu2_3_crit: cpu_crit {
+                               cpu2_3_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -2059,7 +2059,7 @@
                                        hysteresis = <2000>;
                                        type = "passive";
                                };
-                               gpu_crit: gpu_crit {
+                               gpu_crit: gpu-crit {
                                        temperature = <95000>;
                                        hysteresis = <2000>;
                                        type = "critical";

diff --git a/arch/arm64/boot/dts/qcom/msm8953.dtsi b/arch/arm64/boot/dts/qcom/msm8953.dtsi
index e38fa09..068eac8 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8953.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8953.dtsi
@@ -146,12 +146,12 @@
                        };
                };
 
-               L2_0: l2-cache_0 {
+               L2_0: l2-cache-0 {
                        compatible = "cache";
                        cache-level = <2>;
                };
 
-               L2_1: l2-cache_1 {
+               L2_1: l2-cache-1 {
                        compatible = "cache";
                        cache-level = <2>;
                };

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index 87ff66e..d2b3fdf 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -3583,7 +3583,7 @@
                                        type = "passive";
                                };
 
-                               cpu0_crit: cpu_crit {
+                               cpu0_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -3604,7 +3604,7 @@
                                        type = "passive";
                                };
 
-                               cpu1_crit: cpu_crit {
+                               cpu1_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -3625,7 +3625,7 @@
                                        type = "passive";
                                };
 
-                               cpu2_crit: cpu_crit {
+                               cpu2_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -3646,7 +3646,7 @@
                                        type = "passive";
                                };
 
-                               cpu3_crit: cpu_crit {
+                               cpu3_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";

diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
index 18cc149..28d0085 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
@@ -465,7 +465,7 @@
                                        type = "passive";
                                };
 
-                               cpu0_crit: cpu_crit {
+                               cpu0_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -486,7 +486,7 @@
                                        type = "passive";
                                };
 
-                               cpu1_crit: cpu_crit {
+                               cpu1_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -507,7 +507,7 @@
                                        type = "passive";
                                };
 
-                               cpu2_crit: cpu_crit {
+                               cpu2_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -528,7 +528,7 @@
                                        type = "passive";
                                };
 
-                               cpu3_crit: cpu_crit {
+                               cpu3_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -549,7 +549,7 @@
                                        type = "passive";
                                };
 
-                               cpu4_crit: cpu_crit {
+                               cpu4_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -570,7 +570,7 @@
                                        type = "passive";
                                };
 
-                               cpu5_crit: cpu_crit {
+                               cpu5_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -591,7 +591,7 @@
                                        type = "passive";
                                };
 
-                               cpu6_crit: cpu_crit {
+                               cpu6_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -612,7 +612,7 @@
                                        type = "passive";
                                };
 
-                               cpu7_crit: cpu_crit {
+                               cpu7_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";

diff --git a/arch/arm64/boot/dts/qcom/qcs404.dtsi b/arch/arm64/boot/dts/qcom/qcs404.dtsi
index 7de75f1..4aaa3c1 100644 (file)
--- a/arch/arm64/boot/dts/qcom/qcs404.dtsi
+++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi
@@ -1517,7 +1517,7 @@
                                        hysteresis = <2000>;
                                        type = "passive";
                                };
-                               cluster_crit: cluster_crit {
+                               cluster_crit: cluster-crit {
                                        temperature = <120000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -1551,7 +1551,7 @@
                                        hysteresis = <2000>;
                                        type = "passive";
                                };
-                               cpu0_crit: cpu_crit {
+                               cpu0_crit: cpu-crit {
                                        temperature = <120000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -1585,7 +1585,7 @@
                                        hysteresis = <2000>;
                                        type = "passive";
                                };
-                               cpu1_crit: cpu_crit {
+                               cpu1_crit: cpu-crit {
                                        temperature = <120000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -1619,7 +1619,7 @@
                                        hysteresis = <2000>;
                                        type = "passive";
                                };
-                               cpu2_crit: cpu_crit {
+                               cpu2_crit: cpu-crit {
                                        temperature = <120000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -1653,7 +1653,7 @@
                                        hysteresis = <2000>;
                                        type = "passive";
                                };
-                               cpu3_crit: cpu_crit {
+                               cpu3_crit: cpu-crit {
                                        temperature = <120000>;
                                        hysteresis = <2000>;
                                        type = "critical";

diff --git a/arch/arm64/boot/dts/qcom/sa8155p-adp.dts b/arch/arm64/boot/dts/qcom/sa8155p-adp.dts
index f41dcc3..eafdfbb 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sa8155p-adp.dts
+++ b/arch/arm64/boot/dts/qcom/sa8155p-adp.dts
@@ -23,7 +23,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       vreg_3p3: vreg_3p3_regulator {
+       vreg_3p3: vreg-3p3-regulator {
                compatible = "regulator-fixed";
                regulator-name = "vreg_3p3";
                regulator-min-microvolt = <3300000>;

diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
index 4561327..bf7d36e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -3686,7 +3686,7 @@
                                        type = "passive";
                                };
 
-                               cpu0_crit: cpu_crit {
+                               cpu0_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -3735,7 +3735,7 @@
                                        type = "passive";
                                };
 
-                               cpu1_crit: cpu_crit {
+                               cpu1_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -3784,7 +3784,7 @@
                                        type = "passive";
                                };
 
-                               cpu2_crit: cpu_crit {
+                               cpu2_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -3833,7 +3833,7 @@
                                        type = "passive";
                                };
 
-                               cpu3_crit: cpu_crit {
+                               cpu3_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -3882,7 +3882,7 @@
                                        type = "passive";
                                };
 
-                               cpu4_crit: cpu_crit {
+                               cpu4_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -3931,7 +3931,7 @@
                                        type = "passive";
                                };
 
-                               cpu5_crit: cpu_crit {
+                               cpu5_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -3980,7 +3980,7 @@
                                        type = "passive";
                                };
 
-                               cpu6_crit: cpu_crit {
+                               cpu6_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -4021,7 +4021,7 @@
                                        type = "passive";
                                };
 
-                               cpu7_crit: cpu_crit {
+                               cpu7_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -4062,7 +4062,7 @@
                                        type = "passive";
                                };
 
-                               cpu8_crit: cpu_crit {
+                               cpu8_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -4103,7 +4103,7 @@
                                        type = "passive";
                                };
 
-                               cpu9_crit: cpu_crit {
+                               cpu9_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -4137,7 +4137,7 @@
                                        type = "hot";
                                };
 
-                               aoss0_crit: aoss0_crit {
+                               aoss0_crit: aoss0-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -4157,7 +4157,7 @@
                                        hysteresis = <2000>;
                                        type = "hot";
                                };
-                               cpuss0_crit: cluster0_crit {
+                               cpuss0_crit: cluster0-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -4177,7 +4177,7 @@
                                        hysteresis = <2000>;
                                        type = "hot";
                                };
-                               cpuss1_crit: cluster0_crit {
+                               cpuss1_crit: cluster0-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -4198,7 +4198,7 @@
                                        type = "passive";
                                };
 
-                               gpuss0_crit: gpuss0_crit {
+                               gpuss0_crit: gpuss0-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -4226,7 +4226,7 @@
                                        type = "passive";
                                };
 
-                               gpuss1_crit: gpuss1_crit {
+                               gpuss1_crit: gpuss1-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -4254,7 +4254,7 @@
                                        type = "hot";
                                };
 
-                               aoss1_crit: aoss1_crit {
+                               aoss1_crit: aoss1-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -4275,7 +4275,7 @@
                                        type = "hot";
                                };
 
-                               cwlan_crit: cwlan_crit {
+                               cwlan_crit: cwlan-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -4296,7 +4296,7 @@
                                        type = "hot";
                                };
 
-                               audio_crit: audio_crit {
+                               audio_crit: audio-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -4317,7 +4317,7 @@
                                        type = "hot";
                                };
 
-                               ddr_crit: ddr_crit {
+                               ddr_crit: ddr-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -4338,7 +4338,7 @@
                                        type = "hot";
                                };
 
-                               q6_hvx_crit: q6_hvx_crit {
+                               q6_hvx_crit: q6-hvx-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -4359,7 +4359,7 @@
                                        type = "hot";
                                };
 
-                               camera_crit: camera_crit {
+                               camera_crit: camera-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -4380,7 +4380,7 @@
                                        type = "hot";
                                };
 
-                               mdm_crit: mdm_crit {
+                               mdm_crit: mdm-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -4401,7 +4401,7 @@
                                        type = "hot";
                                };
 
-                               mdm_dsp_crit: mdm_dsp_crit {
+                               mdm_dsp_crit: mdm-dsp-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -4422,7 +4422,7 @@
                                        type = "hot";
                                };
 
-                               npu_crit: npu_crit {
+                               npu_crit: npu-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";
@@ -4443,7 +4443,7 @@
                                        type = "hot";
                                };
 
-                               video_crit: video_crit {
+                               video_crit: video-crit {
                                        temperature = <110000>;
                                        hysteresis = <2000>;
                                        type = "critical";

diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
index 3d2b08d..0259e90 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
@@ -57,7 +57,7 @@
                regulator-boot-on;
        };
 
-       cam_vdig_imx300_219_vreg: cam_vdig_imx300_219_vreg {
+       cam_vdig_imx300_219_vreg: cam-vdig-imx300-219-regulator {
                compatible = "regulator-fixed";
                regulator-name = "cam_vdig_imx300_219_vreg";
                startup-delay-us = <0>;
@@ -67,7 +67,7 @@
                pinctrl-0 = <&cam_vdig_default>;
        };
 
-       cam_vana_front_vreg: cam_vana_front_vreg {
+       cam_vana_front_vreg: cam-vana-front-regulator {
                compatible = "regulator-fixed";
                regulator-name = "cam_vana_front_vreg";
                startup-delay-us = <0>;
@@ -77,7 +77,7 @@
                pinctrl-0 = <&imx219_vana_default>;
        };
 
-       cam_vana_rear_vreg: cam_vana_rear_vreg {
+       cam_vana_rear_vreg: cam-vana-rear-regulator {
                compatible = "regulator-fixed";
                regulator-name = "cam_vana_rear_vreg";
                startup-delay-us = <0>;

diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi
index d8920cc..e08ead0 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm630.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi
@@ -2410,7 +2410,7 @@
                                        type = "passive";
                                };
 
-                               cpu0_crit: cpu_crit {
+                               cpu0_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -2431,7 +2431,7 @@
                                        type = "passive";
                                };
 
-                               cpu1_crit: cpu_crit {
+                               cpu1_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -2452,7 +2452,7 @@
                                        type = "passive";
                                };
 
-                               cpu2_crit: cpu_crit {
+                               cpu2_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -2473,7 +2473,7 @@
                                        type = "passive";
                                };
 
-                               cpu3_crit: cpu_crit {
+                               cpu3_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -2500,7 +2500,7 @@
                                        type = "passive";
                                };
 
-                               pwr_cluster_crit: cpu_crit {
+                               pwr_cluster_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";

diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
index f7c3026..0d935c9 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
@@ -142,7 +142,7 @@
                 */
        };
 
-       cam0_dvdd_1v2: reg_cam0_dvdd_1v2 {
+       cam0_dvdd_1v2: cam0-dvdd-1v2-regulator {
                compatible = "regulator-fixed";
                regulator-name = "CAM0_DVDD_1V2";
                regulator-min-microvolt = <1200000>;
@@ -154,7 +154,7 @@
                vin-supply = <&vbat>;
        };
 
-       cam0_avdd_2v8: reg_cam0_avdd_2v8 {
+       cam0_avdd_2v8: cam0-avdd-2v8-regulator {
                compatible = "regulator-fixed";
                regulator-name = "CAM0_AVDD_2V8";
                regulator-min-microvolt = <2800000>;
@@ -167,7 +167,7 @@
        };
 
        /* This regulator is enabled when the VREG_LVS1A_1P8 trace is enabled */
-       cam3_avdd_2v8: reg_cam3_avdd_2v8 {
+       cam3_avdd_2v8: cam3-avdd-2v8-regulator {
                compatible = "regulator-fixed";
                regulator-name = "CAM3_AVDD_2V8";
                regulator-min-microvolt = <2800000>;

diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index 9bc7f85..198b654 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -5331,7 +5331,7 @@
                                        type = "passive";
                                };
 
-                               cpu0_crit: cpu_crit {
+                               cpu0_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -5358,7 +5358,7 @@
                                        type = "passive";
                                };
 
-                               cpu1_crit: cpu_crit {
+                               cpu1_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -5385,7 +5385,7 @@
                                        type = "passive";
                                };
 
-                               cpu2_crit: cpu_crit {
+                               cpu2_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -5412,7 +5412,7 @@
                                        type = "passive";
                                };
 
-                               cpu3_crit: cpu_crit {
+                               cpu3_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -5439,7 +5439,7 @@
                                        type = "passive";
                                };
 
-                               cpu4_crit: cpu_crit {
+                               cpu4_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -5466,7 +5466,7 @@
                                        type = "passive";
                                };
 
-                               cpu5_crit: cpu_crit {
+                               cpu5_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -5493,7 +5493,7 @@
                                        type = "passive";
                                };
 
-                               cpu6_crit: cpu_crit {
+                               cpu6_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -5520,7 +5520,7 @@
                                        type = "passive";
                                };
 
-                               cpu7_crit: cpu_crit {
+                               cpu7_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";

diff --git a/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts b/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
index ef8ad6c..b22b3f9 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
+++ b/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
@@ -61,7 +61,7 @@
                };
        };
 
-       reserved_memory {
+       reserved-memory {
                #address-cells = <2>;
                #size-cells = <2>;
                debug_mem: memory@ffb00000 {

diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi
index c33f3df..bebe917 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
@@ -4358,7 +4358,7 @@
                                        type = "passive";
                                };
 
-                               cpu0_crit: cpu_crit {
+                               cpu0_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -4402,7 +4402,7 @@
                                        type = "passive";
                                };
 
-                               cpu1_crit: cpu_crit {
+                               cpu1_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -4446,7 +4446,7 @@
                                        type = "passive";
                                };
 
-                               cpu2_crit: cpu_crit {
+                               cpu2_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -4490,7 +4490,7 @@
                                        type = "passive";
                                };
 
-                               cpu3_crit: cpu_crit {
+                               cpu3_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -4534,7 +4534,7 @@
                                        type = "passive";
                                };
 
-                               cpu4_top_crit: cpu_crit {
+                               cpu4_top_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -4578,7 +4578,7 @@
                                        type = "passive";
                                };
 
-                               cpu5_top_crit: cpu_crit {
+                               cpu5_top_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -4622,7 +4622,7 @@
                                        type = "passive";
                                };
 
-                               cpu6_top_crit: cpu_crit {
+                               cpu6_top_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -4666,7 +4666,7 @@
                                        type = "passive";
                                };
 
-                               cpu7_top_crit: cpu_crit {
+                               cpu7_top_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -4710,7 +4710,7 @@
                                        type = "passive";
                                };
 
-                               cpu4_bottom_crit: cpu_crit {
+                               cpu4_bottom_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -4754,7 +4754,7 @@
                                        type = "passive";
                                };
 
-                               cpu5_bottom_crit: cpu_crit {
+                               cpu5_bottom_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -4798,7 +4798,7 @@
                                        type = "passive";
                                };
 
-                               cpu6_bottom_crit: cpu_crit {
+                               cpu6_bottom_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -4842,7 +4842,7 @@
                                        type = "passive";
                                };
 
-                               cpu7_bottom_crit: cpu_crit {
+                               cpu7_bottom_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";

diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
index 8597919..17baaeb 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
@@ -5528,7 +5528,7 @@
                                        type = "passive";
                                };
 
-                               cpu0_crit: cpu_crit {
+                               cpu0_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -5572,7 +5572,7 @@
                                        type = "passive";
                                };
 
-                               cpu1_crit: cpu_crit {
+                               cpu1_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -5616,7 +5616,7 @@
                                        type = "passive";
                                };
 
-                               cpu2_crit: cpu_crit {
+                               cpu2_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -5660,7 +5660,7 @@
                                        type = "passive";
                                };
 
-                               cpu3_crit: cpu_crit {
+                               cpu3_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -5704,7 +5704,7 @@
                                        type = "passive";
                                };
 
-                               cpu4_top_crit: cpu_crit {
+                               cpu4_top_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -5748,7 +5748,7 @@
                                        type = "passive";
                                };
 
-                               cpu5_top_crit: cpu_crit {
+                               cpu5_top_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -5792,7 +5792,7 @@
                                        type = "passive";
                                };
 
-                               cpu6_top_crit: cpu_crit {
+                               cpu6_top_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -5836,7 +5836,7 @@
                                        type = "passive";
                                };
 
-                               cpu7_top_crit: cpu_crit {
+                               cpu7_top_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -5880,7 +5880,7 @@
                                        type = "passive";
                                };
 
-                               cpu4_bottom_crit: cpu_crit {
+                               cpu4_bottom_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -5924,7 +5924,7 @@
                                        type = "passive";
                                };
 
-                               cpu5_bottom_crit: cpu_crit {
+                               cpu5_bottom_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -5968,7 +5968,7 @@
                                        type = "passive";
                                };
 
-                               cpu6_bottom_crit: cpu_crit {
+                               cpu6_bottom_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -6012,7 +6012,7 @@
                                        type = "passive";
                                };
 
-                               cpu7_bottom_crit: cpu_crit {
+                               cpu7_bottom_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";

diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi
index ae77dfb..334ac22 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8350.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi
@@ -2737,7 +2737,7 @@
                                        type = "passive";
                                };
 
-                               cpu0_crit: cpu_crit {
+                               cpu0_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -2781,7 +2781,7 @@
                                        type = "passive";
                                };
 
-                               cpu1_crit: cpu_crit {
+                               cpu1_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -2825,7 +2825,7 @@
                                        type = "passive";
                                };
 
-                               cpu2_crit: cpu_crit {
+                               cpu2_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -2869,7 +2869,7 @@
                                        type = "passive";
                                };
 
-                               cpu3_crit: cpu_crit {
+                               cpu3_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -2913,7 +2913,7 @@
                                        type = "passive";
                                };
 
-                               cpu4_top_crit: cpu_crit {
+                               cpu4_top_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -2957,7 +2957,7 @@
                                        type = "passive";
                                };
 
-                               cpu5_top_crit: cpu_crit {
+                               cpu5_top_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -3001,7 +3001,7 @@
                                        type = "passive";
                                };
 
-                               cpu6_top_crit: cpu_crit {
+                               cpu6_top_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -3045,7 +3045,7 @@
                                        type = "passive";
                                };
 
-                               cpu7_top_crit: cpu_crit {
+                               cpu7_top_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -3089,7 +3089,7 @@
                                        type = "passive";
                                };
 
-                               cpu4_bottom_crit: cpu_crit {
+                               cpu4_bottom_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -3133,7 +3133,7 @@
                                        type = "passive";
                                };
 
-                               cpu5_bottom_crit: cpu_crit {
+                               cpu5_bottom_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -3177,7 +3177,7 @@
                                        type = "passive";
                                };
 
-                               cpu6_bottom_crit: cpu_crit {
+                               cpu6_bottom_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -3221,7 +3221,7 @@
                                        type = "passive";
                                };
 
-                               cpu7_bottom_crit: cpu_crit {
+                               cpu7_bottom_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";

diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi
index 7b1889f..691dfc7 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8450.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi
@@ -4268,7 +4268,7 @@
                                        type = "passive";
                                };
 
-                               cpu4_top_crit: cpu_crit {
+                               cpu4_top_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -4294,7 +4294,7 @@
                                        type = "passive";
                                };
 
-                               cpu4_bottom_crit: cpu_crit {
+                               cpu4_bottom_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -4320,7 +4320,7 @@
                                        type = "passive";
                                };
 
-                               cpu5_top_crit: cpu_crit {
+                               cpu5_top_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -4346,7 +4346,7 @@
                                        type = "passive";
                                };
 
-                               cpu5_bottom_crit: cpu_crit {
+                               cpu5_bottom_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -4372,7 +4372,7 @@
                                        type = "passive";
                                };
 
-                               cpu6_top_crit: cpu_crit {
+                               cpu6_top_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -4398,7 +4398,7 @@
                                        type = "passive";
                                };
 
-                               cpu6_bottom_crit: cpu_crit {
+                               cpu6_bottom_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -4424,7 +4424,7 @@
                                        type = "passive";
                                };
 
-                               cpu7_top_crit: cpu_crit {
+                               cpu7_top_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -4450,7 +4450,7 @@
                                        type = "passive";
                                };
 
-                               cpu7_middle_crit: cpu_crit {
+                               cpu7_middle_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -4476,7 +4476,7 @@
                                        type = "passive";
                                };
 
-                               cpu7_bottom_crit: cpu_crit {
+                               cpu7_bottom_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -4508,7 +4508,7 @@
                                        type = "passive";
                                };
 
-                               gpu0_tj_cfg: tj_cfg {
+                               gpu0_tj_cfg: tj-cfg {
                                        temperature = <95000>;
                                        hysteresis = <5000>;
                                        type = "passive";
@@ -4540,7 +4540,7 @@
                                        type = "passive";
                                };
 
-                               gpu1_tj_cfg: tj_cfg {
+                               gpu1_tj_cfg: tj-cfg {
                                        temperature = <95000>;
                                        hysteresis = <5000>;
                                        type = "passive";
@@ -4586,7 +4586,7 @@
                                        type = "passive";
                                };
 
-                               cpu0_crit: cpu_crit {
+                               cpu0_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -4612,7 +4612,7 @@
                                        type = "passive";
                                };
 
-                               cpu1_crit: cpu_crit {
+                               cpu1_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -4638,7 +4638,7 @@
                                        type = "passive";
                                };
 
-                               cpu2_crit: cpu_crit {
+                               cpu2_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -4664,7 +4664,7 @@
                                        type = "passive";
                                };
 
-                               cpu3_crit: cpu_crit {
+                               cpu3_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";