* [PATCH] arm64: dts: qcom: replace underscores in node names
@ 2022-12-14 11:04 Krzysztof Kozlowski
2022-12-14 11:45 ` Konrad Dybcio
2023-01-11 5:09 ` Bjorn Andersson
0 siblings, 2 replies; 6+ messages in thread
From: Krzysztof Kozlowski @ 2022-12-14 11:04 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, linux-arm-msm, devicetree, linux-kernel
Cc: Krzysztof Kozlowski
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>
---
arch/arm64/boot/dts/qcom/msm8916.dtsi | 6 +--
arch/arm64/boot/dts/qcom/msm8953.dtsi | 4 +-
arch/arm64/boot/dts/qcom/msm8996.dtsi | 8 +--
arch/arm64/boot/dts/qcom/msm8998.dtsi | 16 +++---
arch/arm64/boot/dts/qcom/qcs404.dtsi | 10 ++--
arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 2 +-
arch/arm64/boot/dts/qcom/sc7180.dtsi | 50 +++++++++----------
.../dts/qcom/sdm630-sony-xperia-nile.dtsi | 6 +--
arch/arm64/boot/dts/qcom/sdm630.dtsi | 10 ++--
arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 6 +--
arch/arm64/boot/dts/qcom/sdm845.dtsi | 16 +++---
.../qcom/sm6125-sony-xperia-seine-pdx201.dts | 2 +-
arch/arm64/boot/dts/qcom/sm8150.dtsi | 24 ++++-----
arch/arm64/boot/dts/qcom/sm8250.dtsi | 24 ++++-----
arch/arm64/boot/dts/qcom/sm8350.dtsi | 24 ++++-----
arch/arm64/boot/dts/qcom/sm8450.dtsi | 30 +++++------
16 files changed, 119 insertions(+), 119 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 2ca8e977fc2a..dd2c9e2edeb0 100644
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -1998,7 +1998,7 @@ cpu0_1_alert0: trip-point0 {
hysteresis = <2000>;
type = "passive";
};
- cpu0_1_crit: cpu_crit {
+ cpu0_1_crit: cpu-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -2028,7 +2028,7 @@ cpu2_3_alert0: trip-point0 {
hysteresis = <2000>;
type = "passive";
};
- cpu2_3_crit: cpu_crit {
+ cpu2_3_crit: cpu-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -2058,7 +2058,7 @@ gpu_alert0: trip-point0 {
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 32349174c4bd..60ef163c8602 100644
--- a/arch/arm64/boot/dts/qcom/msm8953.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8953.dtsi
@@ -202,12 +202,12 @@ core3 {
};
};
- 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 d31464204f69..25616a0fe63e 100644
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -3580,7 +3580,7 @@ cpu0_alert0: trip-point0 {
type = "passive";
};
- cpu0_crit: cpu_crit {
+ cpu0_crit: cpu-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -3601,7 +3601,7 @@ cpu1_alert0: trip-point0 {
type = "passive";
};
- cpu1_crit: cpu_crit {
+ cpu1_crit: cpu-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -3622,7 +3622,7 @@ cpu2_alert0: trip-point0 {
type = "passive";
};
- cpu2_crit: cpu_crit {
+ cpu2_crit: cpu-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -3643,7 +3643,7 @@ cpu3_alert0: trip-point0 {
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 539382dab0ad..f137cdc55772 100644
--- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
@@ -465,7 +465,7 @@ cpu0_alert0: trip-point0 {
type = "passive";
};
- cpu0_crit: cpu_crit {
+ cpu0_crit: cpu-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -486,7 +486,7 @@ cpu1_alert0: trip-point0 {
type = "passive";
};
- cpu1_crit: cpu_crit {
+ cpu1_crit: cpu-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -507,7 +507,7 @@ cpu2_alert0: trip-point0 {
type = "passive";
};
- cpu2_crit: cpu_crit {
+ cpu2_crit: cpu-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -528,7 +528,7 @@ cpu3_alert0: trip-point0 {
type = "passive";
};
- cpu3_crit: cpu_crit {
+ cpu3_crit: cpu-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -549,7 +549,7 @@ cpu4_alert0: trip-point0 {
type = "passive";
};
- cpu4_crit: cpu_crit {
+ cpu4_crit: cpu-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -570,7 +570,7 @@ cpu5_alert0: trip-point0 {
type = "passive";
};
- cpu5_crit: cpu_crit {
+ cpu5_crit: cpu-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -591,7 +591,7 @@ cpu6_alert0: trip-point0 {
type = "passive";
};
- cpu6_crit: cpu_crit {
+ cpu6_crit: cpu-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -612,7 +612,7 @@ cpu7_alert0: trip-point0 {
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 a5324eecb50a..b4d230d8e5cd 100644
--- a/arch/arm64/boot/dts/qcom/qcs404.dtsi
+++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi
@@ -1502,7 +1502,7 @@ cluster_alert1: trip-point1 {
hysteresis = <2000>;
type = "passive";
};
- cluster_crit: cluster_crit {
+ cluster_crit: cluster-crit {
temperature = <120000>;
hysteresis = <2000>;
type = "critical";
@@ -1536,7 +1536,7 @@ cpu0_alert1: trip-point1 {
hysteresis = <2000>;
type = "passive";
};
- cpu0_crit: cpu_crit {
+ cpu0_crit: cpu-crit {
temperature = <120000>;
hysteresis = <2000>;
type = "critical";
@@ -1570,7 +1570,7 @@ cpu1_alert1: trip-point1 {
hysteresis = <2000>;
type = "passive";
};
- cpu1_crit: cpu_crit {
+ cpu1_crit: cpu-crit {
temperature = <120000>;
hysteresis = <2000>;
type = "critical";
@@ -1604,7 +1604,7 @@ cpu2_alert1: trip-point1 {
hysteresis = <2000>;
type = "passive";
};
- cpu2_crit: cpu_crit {
+ cpu2_crit: cpu-crit {
temperature = <120000>;
hysteresis = <2000>;
type = "critical";
@@ -1638,7 +1638,7 @@ cpu3_alert1: trip-point1 {
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 f41dcc379dce..eafdfbbf40b9 100644
--- a/arch/arm64/boot/dts/qcom/sa8155p-adp.dts
+++ b/arch/arm64/boot/dts/qcom/sa8155p-adp.dts
@@ -23,7 +23,7 @@ chosen {
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 f71cf21a8dd8..792e1e5fe70d 100644
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -3681,7 +3681,7 @@ cpu0_alert1: trip-point1 {
type = "passive";
};
- cpu0_crit: cpu_crit {
+ cpu0_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -3730,7 +3730,7 @@ cpu1_alert1: trip-point1 {
type = "passive";
};
- cpu1_crit: cpu_crit {
+ cpu1_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -3779,7 +3779,7 @@ cpu2_alert1: trip-point1 {
type = "passive";
};
- cpu2_crit: cpu_crit {
+ cpu2_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -3828,7 +3828,7 @@ cpu3_alert1: trip-point1 {
type = "passive";
};
- cpu3_crit: cpu_crit {
+ cpu3_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -3877,7 +3877,7 @@ cpu4_alert1: trip-point1 {
type = "passive";
};
- cpu4_crit: cpu_crit {
+ cpu4_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -3926,7 +3926,7 @@ cpu5_alert1: trip-point1 {
type = "passive";
};
- cpu5_crit: cpu_crit {
+ cpu5_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -3975,7 +3975,7 @@ cpu6_alert1: trip-point1 {
type = "passive";
};
- cpu6_crit: cpu_crit {
+ cpu6_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -4016,7 +4016,7 @@ cpu7_alert1: trip-point1 {
type = "passive";
};
- cpu7_crit: cpu_crit {
+ cpu7_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -4057,7 +4057,7 @@ cpu8_alert1: trip-point1 {
type = "passive";
};
- cpu8_crit: cpu_crit {
+ cpu8_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -4098,7 +4098,7 @@ cpu9_alert1: trip-point1 {
type = "passive";
};
- cpu9_crit: cpu_crit {
+ cpu9_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -4132,7 +4132,7 @@ aoss0_alert0: trip-point0 {
type = "hot";
};
- aoss0_crit: aoss0_crit {
+ aoss0_crit: aoss0-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -4152,7 +4152,7 @@ cpuss0_alert0: trip-point0 {
hysteresis = <2000>;
type = "hot";
};
- cpuss0_crit: cluster0_crit {
+ cpuss0_crit: cluster0-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -4172,7 +4172,7 @@ cpuss1_alert0: trip-point0 {
hysteresis = <2000>;
type = "hot";
};
- cpuss1_crit: cluster0_crit {
+ cpuss1_crit: cluster0-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -4193,7 +4193,7 @@ gpuss0_alert0: trip-point0 {
type = "passive";
};
- gpuss0_crit: gpuss0_crit {
+ gpuss0_crit: gpuss0-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -4221,7 +4221,7 @@ gpuss1_alert0: trip-point0 {
type = "passive";
};
- gpuss1_crit: gpuss1_crit {
+ gpuss1_crit: gpuss1-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -4249,7 +4249,7 @@ aoss1_alert0: trip-point0 {
type = "hot";
};
- aoss1_crit: aoss1_crit {
+ aoss1_crit: aoss1-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -4270,7 +4270,7 @@ cwlan_alert0: trip-point0 {
type = "hot";
};
- cwlan_crit: cwlan_crit {
+ cwlan_crit: cwlan-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -4291,7 +4291,7 @@ audio_alert0: trip-point0 {
type = "hot";
};
- audio_crit: audio_crit {
+ audio_crit: audio-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -4312,7 +4312,7 @@ ddr_alert0: trip-point0 {
type = "hot";
};
- ddr_crit: ddr_crit {
+ ddr_crit: ddr-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -4333,7 +4333,7 @@ q6_hvx_alert0: trip-point0 {
type = "hot";
};
- q6_hvx_crit: q6_hvx_crit {
+ q6_hvx_crit: q6-hvx-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -4354,7 +4354,7 @@ camera_alert0: trip-point0 {
type = "hot";
};
- camera_crit: camera_crit {
+ camera_crit: camera-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -4375,7 +4375,7 @@ mdm_alert0: trip-point0 {
type = "hot";
};
- mdm_crit: mdm_crit {
+ mdm_crit: mdm-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -4396,7 +4396,7 @@ mdm_dsp_alert0: trip-point0 {
type = "hot";
};
- mdm_dsp_crit: mdm_dsp_crit {
+ mdm_dsp_crit: mdm-dsp-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -4417,7 +4417,7 @@ npu_alert0: trip-point0 {
type = "hot";
};
- npu_crit: npu_crit {
+ npu_crit: npu-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -4438,7 +4438,7 @@ video_alert0: trip-point0 {
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 3d2b08d551d0..0259e90aad1c 100644
--- 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 @@ vph_pwr: vph-pwr-regulator {
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 @@ cam_vdig_imx300_219_vreg: cam_vdig_imx300_219_vreg {
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 @@ cam_vana_front_vreg: cam_vana_front_vreg {
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 13e6a4fbba27..810f51b48dce 100644
--- a/arch/arm64/boot/dts/qcom/sdm630.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi
@@ -2409,7 +2409,7 @@ cpu0_alert0: trip-point0 {
type = "passive";
};
- cpu0_crit: cpu_crit {
+ cpu0_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -2430,7 +2430,7 @@ cpu1_alert0: trip-point0 {
type = "passive";
};
- cpu1_crit: cpu_crit {
+ cpu1_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -2451,7 +2451,7 @@ cpu2_alert0: trip-point0 {
type = "passive";
};
- cpu2_crit: cpu_crit {
+ cpu2_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -2472,7 +2472,7 @@ cpu3_alert0: trip-point0 {
type = "passive";
};
- cpu3_crit: cpu_crit {
+ cpu3_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -2499,7 +2499,7 @@ pwr_cluster_alert0: trip-point0 {
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 f41c6d600ea8..4f64f4115175 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
@@ -142,7 +142,7 @@ pcie0_1p05v: pcie-0-1p05v-regulator {
*/
};
- 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 @@ cam0_dvdd_1v2: reg_cam0_dvdd_1v2 {
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 @@ cam0_avdd_2v8: reg_cam0_avdd_2v8 {
};
/* 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 65032b94b46d..444fe75ede13 100644
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -5385,7 +5385,7 @@ cpu0_alert1: trip-point1 {
type = "passive";
};
- cpu0_crit: cpu_crit {
+ cpu0_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -5412,7 +5412,7 @@ cpu1_alert1: trip-point1 {
type = "passive";
};
- cpu1_crit: cpu_crit {
+ cpu1_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -5439,7 +5439,7 @@ cpu2_alert1: trip-point1 {
type = "passive";
};
- cpu2_crit: cpu_crit {
+ cpu2_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -5466,7 +5466,7 @@ cpu3_alert1: trip-point1 {
type = "passive";
};
- cpu3_crit: cpu_crit {
+ cpu3_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -5493,7 +5493,7 @@ cpu4_alert1: trip-point1 {
type = "passive";
};
- cpu4_crit: cpu_crit {
+ cpu4_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -5520,7 +5520,7 @@ cpu5_alert1: trip-point1 {
type = "passive";
};
- cpu5_crit: cpu_crit {
+ cpu5_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -5547,7 +5547,7 @@ cpu6_alert1: trip-point1 {
type = "passive";
};
- cpu6_crit: cpu_crit {
+ cpu6_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -5574,7 +5574,7 @@ cpu7_alert1: trip-point1 {
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 0de6c5b7f742..476df4f6e58a 100644
--- a/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
+++ b/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
@@ -55,7 +55,7 @@ key-vol-dn {
};
};
- 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 a0c57fb798d3..e3997a0e3dff 100644
--- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
@@ -4057,7 +4057,7 @@ cpu0_alert1: trip-point1 {
type = "passive";
};
- cpu0_crit: cpu_crit {
+ cpu0_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -4101,7 +4101,7 @@ cpu1_alert1: trip-point1 {
type = "passive";
};
- cpu1_crit: cpu_crit {
+ cpu1_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -4145,7 +4145,7 @@ cpu2_alert1: trip-point1 {
type = "passive";
};
- cpu2_crit: cpu_crit {
+ cpu2_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -4189,7 +4189,7 @@ cpu3_alert1: trip-point1 {
type = "passive";
};
- cpu3_crit: cpu_crit {
+ cpu3_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -4233,7 +4233,7 @@ cpu4_top_alert1: trip-point1 {
type = "passive";
};
- cpu4_top_crit: cpu_crit {
+ cpu4_top_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -4277,7 +4277,7 @@ cpu5_top_alert1: trip-point1 {
type = "passive";
};
- cpu5_top_crit: cpu_crit {
+ cpu5_top_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -4321,7 +4321,7 @@ cpu6_top_alert1: trip-point1 {
type = "passive";
};
- cpu6_top_crit: cpu_crit {
+ cpu6_top_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -4365,7 +4365,7 @@ cpu7_top_alert1: trip-point1 {
type = "passive";
};
- cpu7_top_crit: cpu_crit {
+ cpu7_top_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -4409,7 +4409,7 @@ cpu4_bottom_alert1: trip-point1 {
type = "passive";
};
- cpu4_bottom_crit: cpu_crit {
+ cpu4_bottom_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -4453,7 +4453,7 @@ cpu5_bottom_alert1: trip-point1 {
type = "passive";
};
- cpu5_bottom_crit: cpu_crit {
+ cpu5_bottom_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -4497,7 +4497,7 @@ cpu6_bottom_alert1: trip-point1 {
type = "passive";
};
- cpu6_bottom_crit: cpu_crit {
+ cpu6_bottom_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -4541,7 +4541,7 @@ cpu7_bottom_alert1: trip-point1 {
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 dab5579946f3..46186e521aba 100644
--- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
@@ -5500,7 +5500,7 @@ cpu0_alert1: trip-point1 {
type = "passive";
};
- cpu0_crit: cpu_crit {
+ cpu0_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -5544,7 +5544,7 @@ cpu1_alert1: trip-point1 {
type = "passive";
};
- cpu1_crit: cpu_crit {
+ cpu1_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -5588,7 +5588,7 @@ cpu2_alert1: trip-point1 {
type = "passive";
};
- cpu2_crit: cpu_crit {
+ cpu2_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -5632,7 +5632,7 @@ cpu3_alert1: trip-point1 {
type = "passive";
};
- cpu3_crit: cpu_crit {
+ cpu3_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -5676,7 +5676,7 @@ cpu4_top_alert1: trip-point1 {
type = "passive";
};
- cpu4_top_crit: cpu_crit {
+ cpu4_top_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -5720,7 +5720,7 @@ cpu5_top_alert1: trip-point1 {
type = "passive";
};
- cpu5_top_crit: cpu_crit {
+ cpu5_top_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -5764,7 +5764,7 @@ cpu6_top_alert1: trip-point1 {
type = "passive";
};
- cpu6_top_crit: cpu_crit {
+ cpu6_top_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -5808,7 +5808,7 @@ cpu7_top_alert1: trip-point1 {
type = "passive";
};
- cpu7_top_crit: cpu_crit {
+ cpu7_top_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -5852,7 +5852,7 @@ cpu4_bottom_alert1: trip-point1 {
type = "passive";
};
- cpu4_bottom_crit: cpu_crit {
+ cpu4_bottom_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -5896,7 +5896,7 @@ cpu5_bottom_alert1: trip-point1 {
type = "passive";
};
- cpu5_bottom_crit: cpu_crit {
+ cpu5_bottom_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -5940,7 +5940,7 @@ cpu6_bottom_alert1: trip-point1 {
type = "passive";
};
- cpu6_bottom_crit: cpu_crit {
+ cpu6_bottom_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -5984,7 +5984,7 @@ cpu7_bottom_alert1: trip-point1 {
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 245dce24ec59..b41bc3b005fb 100644
--- a/arch/arm64/boot/dts/qcom/sm8350.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi
@@ -2728,7 +2728,7 @@ cpu0_alert1: trip-point1 {
type = "passive";
};
- cpu0_crit: cpu_crit {
+ cpu0_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -2772,7 +2772,7 @@ cpu1_alert1: trip-point1 {
type = "passive";
};
- cpu1_crit: cpu_crit {
+ cpu1_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -2816,7 +2816,7 @@ cpu2_alert1: trip-point1 {
type = "passive";
};
- cpu2_crit: cpu_crit {
+ cpu2_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -2860,7 +2860,7 @@ cpu3_alert1: trip-point1 {
type = "passive";
};
- cpu3_crit: cpu_crit {
+ cpu3_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -2904,7 +2904,7 @@ cpu4_top_alert1: trip-point1 {
type = "passive";
};
- cpu4_top_crit: cpu_crit {
+ cpu4_top_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -2948,7 +2948,7 @@ cpu5_top_alert1: trip-point1 {
type = "passive";
};
- cpu5_top_crit: cpu_crit {
+ cpu5_top_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -2992,7 +2992,7 @@ cpu6_top_alert1: trip-point1 {
type = "passive";
};
- cpu6_top_crit: cpu_crit {
+ cpu6_top_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -3036,7 +3036,7 @@ cpu7_top_alert1: trip-point1 {
type = "passive";
};
- cpu7_top_crit: cpu_crit {
+ cpu7_top_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -3080,7 +3080,7 @@ cpu4_bottom_alert1: trip-point1 {
type = "passive";
};
- cpu4_bottom_crit: cpu_crit {
+ cpu4_bottom_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -3124,7 +3124,7 @@ cpu5_bottom_alert1: trip-point1 {
type = "passive";
};
- cpu5_bottom_crit: cpu_crit {
+ cpu5_bottom_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -3168,7 +3168,7 @@ cpu6_bottom_alert1: trip-point1 {
type = "passive";
};
- cpu6_bottom_crit: cpu_crit {
+ cpu6_bottom_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -3212,7 +3212,7 @@ cpu7_bottom_alert1: trip-point1 {
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 570475040d95..8b0a0c990392 100644
--- a/arch/arm64/boot/dts/qcom/sm8450.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi
@@ -3953,7 +3953,7 @@ cpu4_top_alert1: trip-point1 {
type = "passive";
};
- cpu4_top_crit: cpu_crit {
+ cpu4_top_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -3979,7 +3979,7 @@ cpu4_bottom_alert1: trip-point1 {
type = "passive";
};
- cpu4_bottom_crit: cpu_crit {
+ cpu4_bottom_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -4005,7 +4005,7 @@ cpu5_top_alert1: trip-point1 {
type = "passive";
};
- cpu5_top_crit: cpu_crit {
+ cpu5_top_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -4031,7 +4031,7 @@ cpu5_bottom_alert1: trip-point1 {
type = "passive";
};
- cpu5_bottom_crit: cpu_crit {
+ cpu5_bottom_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -4057,7 +4057,7 @@ cpu6_top_alert1: trip-point1 {
type = "passive";
};
- cpu6_top_crit: cpu_crit {
+ cpu6_top_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -4083,7 +4083,7 @@ cpu6_bottom_alert1: trip-point1 {
type = "passive";
};
- cpu6_bottom_crit: cpu_crit {
+ cpu6_bottom_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -4109,7 +4109,7 @@ cpu7_top_alert1: trip-point1 {
type = "passive";
};
- cpu7_top_crit: cpu_crit {
+ cpu7_top_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -4135,7 +4135,7 @@ cpu7_middle_alert1: trip-point1 {
type = "passive";
};
- cpu7_middle_crit: cpu_crit {
+ cpu7_middle_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -4161,7 +4161,7 @@ cpu7_bottom_alert1: trip-point1 {
type = "passive";
};
- cpu7_bottom_crit: cpu_crit {
+ cpu7_bottom_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -4193,7 +4193,7 @@ reset-mon-cfg {
type = "passive";
};
- gpu0_tj_cfg: tj_cfg {
+ gpu0_tj_cfg: tj-cfg {
temperature = <95000>;
hysteresis = <5000>;
type = "passive";
@@ -4225,7 +4225,7 @@ reset-mon-cfg {
type = "passive";
};
- gpu1_tj_cfg: tj_cfg {
+ gpu1_tj_cfg: tj-cfg {
temperature = <95000>;
hysteresis = <5000>;
type = "passive";
@@ -4271,7 +4271,7 @@ cpu0_alert1: trip-point1 {
type = "passive";
};
- cpu0_crit: cpu_crit {
+ cpu0_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -4297,7 +4297,7 @@ cpu1_alert1: trip-point1 {
type = "passive";
};
- cpu1_crit: cpu_crit {
+ cpu1_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -4323,7 +4323,7 @@ cpu2_alert1: trip-point1 {
type = "passive";
};
- cpu2_crit: cpu_crit {
+ cpu2_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -4349,7 +4349,7 @@ cpu3_alert1: trip-point1 {
type = "passive";
};
- cpu3_crit: cpu_crit {
+ cpu3_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] arm64: dts: qcom: replace underscores in node names
2022-12-14 11:04 [PATCH] arm64: dts: qcom: replace underscores in node names Krzysztof Kozlowski
@ 2022-12-14 11:45 ` Konrad Dybcio
2023-01-11 5:09 ` Bjorn Andersson
1 sibling, 0 replies; 6+ messages in thread
From: Konrad Dybcio @ 2022-12-14 11:45 UTC (permalink / raw)
To: Krzysztof Kozlowski, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski, linux-arm-msm, devicetree, linux-kernel
On 14.12.2022 12:04, Krzysztof Kozlowski wrote:
> 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>
Konrad
> arch/arm64/boot/dts/qcom/msm8916.dtsi | 6 +--
> arch/arm64/boot/dts/qcom/msm8953.dtsi | 4 +-
> arch/arm64/boot/dts/qcom/msm8996.dtsi | 8 +--
> arch/arm64/boot/dts/qcom/msm8998.dtsi | 16 +++---
> arch/arm64/boot/dts/qcom/qcs404.dtsi | 10 ++--
> arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180.dtsi | 50 +++++++++----------
> .../dts/qcom/sdm630-sony-xperia-nile.dtsi | 6 +--
> arch/arm64/boot/dts/qcom/sdm630.dtsi | 10 ++--
> arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 6 +--
> arch/arm64/boot/dts/qcom/sdm845.dtsi | 16 +++---
> .../qcom/sm6125-sony-xperia-seine-pdx201.dts | 2 +-
> arch/arm64/boot/dts/qcom/sm8150.dtsi | 24 ++++-----
> arch/arm64/boot/dts/qcom/sm8250.dtsi | 24 ++++-----
> arch/arm64/boot/dts/qcom/sm8350.dtsi | 24 ++++-----
> arch/arm64/boot/dts/qcom/sm8450.dtsi | 30 +++++------
> 16 files changed, 119 insertions(+), 119 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
> index 2ca8e977fc2a..dd2c9e2edeb0 100644
> --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
> @@ -1998,7 +1998,7 @@ cpu0_1_alert0: trip-point0 {
> hysteresis = <2000>;
> type = "passive";
> };
> - cpu0_1_crit: cpu_crit {
> + cpu0_1_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -2028,7 +2028,7 @@ cpu2_3_alert0: trip-point0 {
> hysteresis = <2000>;
> type = "passive";
> };
> - cpu2_3_crit: cpu_crit {
> + cpu2_3_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -2058,7 +2058,7 @@ gpu_alert0: trip-point0 {
> 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 32349174c4bd..60ef163c8602 100644
> --- a/arch/arm64/boot/dts/qcom/msm8953.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8953.dtsi
> @@ -202,12 +202,12 @@ core3 {
> };
> };
>
> - 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 d31464204f69..25616a0fe63e 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> @@ -3580,7 +3580,7 @@ cpu0_alert0: trip-point0 {
> type = "passive";
> };
>
> - cpu0_crit: cpu_crit {
> + cpu0_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -3601,7 +3601,7 @@ cpu1_alert0: trip-point0 {
> type = "passive";
> };
>
> - cpu1_crit: cpu_crit {
> + cpu1_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -3622,7 +3622,7 @@ cpu2_alert0: trip-point0 {
> type = "passive";
> };
>
> - cpu2_crit: cpu_crit {
> + cpu2_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -3643,7 +3643,7 @@ cpu3_alert0: trip-point0 {
> 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 539382dab0ad..f137cdc55772 100644
> --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
> @@ -465,7 +465,7 @@ cpu0_alert0: trip-point0 {
> type = "passive";
> };
>
> - cpu0_crit: cpu_crit {
> + cpu0_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -486,7 +486,7 @@ cpu1_alert0: trip-point0 {
> type = "passive";
> };
>
> - cpu1_crit: cpu_crit {
> + cpu1_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -507,7 +507,7 @@ cpu2_alert0: trip-point0 {
> type = "passive";
> };
>
> - cpu2_crit: cpu_crit {
> + cpu2_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -528,7 +528,7 @@ cpu3_alert0: trip-point0 {
> type = "passive";
> };
>
> - cpu3_crit: cpu_crit {
> + cpu3_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -549,7 +549,7 @@ cpu4_alert0: trip-point0 {
> type = "passive";
> };
>
> - cpu4_crit: cpu_crit {
> + cpu4_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -570,7 +570,7 @@ cpu5_alert0: trip-point0 {
> type = "passive";
> };
>
> - cpu5_crit: cpu_crit {
> + cpu5_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -591,7 +591,7 @@ cpu6_alert0: trip-point0 {
> type = "passive";
> };
>
> - cpu6_crit: cpu_crit {
> + cpu6_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -612,7 +612,7 @@ cpu7_alert0: trip-point0 {
> 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 a5324eecb50a..b4d230d8e5cd 100644
> --- a/arch/arm64/boot/dts/qcom/qcs404.dtsi
> +++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi
> @@ -1502,7 +1502,7 @@ cluster_alert1: trip-point1 {
> hysteresis = <2000>;
> type = "passive";
> };
> - cluster_crit: cluster_crit {
> + cluster_crit: cluster-crit {
> temperature = <120000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -1536,7 +1536,7 @@ cpu0_alert1: trip-point1 {
> hysteresis = <2000>;
> type = "passive";
> };
> - cpu0_crit: cpu_crit {
> + cpu0_crit: cpu-crit {
> temperature = <120000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -1570,7 +1570,7 @@ cpu1_alert1: trip-point1 {
> hysteresis = <2000>;
> type = "passive";
> };
> - cpu1_crit: cpu_crit {
> + cpu1_crit: cpu-crit {
> temperature = <120000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -1604,7 +1604,7 @@ cpu2_alert1: trip-point1 {
> hysteresis = <2000>;
> type = "passive";
> };
> - cpu2_crit: cpu_crit {
> + cpu2_crit: cpu-crit {
> temperature = <120000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -1638,7 +1638,7 @@ cpu3_alert1: trip-point1 {
> 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 f41dcc379dce..eafdfbbf40b9 100644
> --- a/arch/arm64/boot/dts/qcom/sa8155p-adp.dts
> +++ b/arch/arm64/boot/dts/qcom/sa8155p-adp.dts
> @@ -23,7 +23,7 @@ chosen {
> 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 f71cf21a8dd8..792e1e5fe70d 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
> @@ -3681,7 +3681,7 @@ cpu0_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu0_crit: cpu_crit {
> + cpu0_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -3730,7 +3730,7 @@ cpu1_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu1_crit: cpu_crit {
> + cpu1_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -3779,7 +3779,7 @@ cpu2_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu2_crit: cpu_crit {
> + cpu2_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -3828,7 +3828,7 @@ cpu3_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu3_crit: cpu_crit {
> + cpu3_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -3877,7 +3877,7 @@ cpu4_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu4_crit: cpu_crit {
> + cpu4_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -3926,7 +3926,7 @@ cpu5_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu5_crit: cpu_crit {
> + cpu5_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -3975,7 +3975,7 @@ cpu6_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu6_crit: cpu_crit {
> + cpu6_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -4016,7 +4016,7 @@ cpu7_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu7_crit: cpu_crit {
> + cpu7_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -4057,7 +4057,7 @@ cpu8_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu8_crit: cpu_crit {
> + cpu8_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -4098,7 +4098,7 @@ cpu9_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu9_crit: cpu_crit {
> + cpu9_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -4132,7 +4132,7 @@ aoss0_alert0: trip-point0 {
> type = "hot";
> };
>
> - aoss0_crit: aoss0_crit {
> + aoss0_crit: aoss0-crit {
> temperature = <110000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -4152,7 +4152,7 @@ cpuss0_alert0: trip-point0 {
> hysteresis = <2000>;
> type = "hot";
> };
> - cpuss0_crit: cluster0_crit {
> + cpuss0_crit: cluster0-crit {
> temperature = <110000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -4172,7 +4172,7 @@ cpuss1_alert0: trip-point0 {
> hysteresis = <2000>;
> type = "hot";
> };
> - cpuss1_crit: cluster0_crit {
> + cpuss1_crit: cluster0-crit {
> temperature = <110000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -4193,7 +4193,7 @@ gpuss0_alert0: trip-point0 {
> type = "passive";
> };
>
> - gpuss0_crit: gpuss0_crit {
> + gpuss0_crit: gpuss0-crit {
> temperature = <110000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -4221,7 +4221,7 @@ gpuss1_alert0: trip-point0 {
> type = "passive";
> };
>
> - gpuss1_crit: gpuss1_crit {
> + gpuss1_crit: gpuss1-crit {
> temperature = <110000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -4249,7 +4249,7 @@ aoss1_alert0: trip-point0 {
> type = "hot";
> };
>
> - aoss1_crit: aoss1_crit {
> + aoss1_crit: aoss1-crit {
> temperature = <110000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -4270,7 +4270,7 @@ cwlan_alert0: trip-point0 {
> type = "hot";
> };
>
> - cwlan_crit: cwlan_crit {
> + cwlan_crit: cwlan-crit {
> temperature = <110000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -4291,7 +4291,7 @@ audio_alert0: trip-point0 {
> type = "hot";
> };
>
> - audio_crit: audio_crit {
> + audio_crit: audio-crit {
> temperature = <110000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -4312,7 +4312,7 @@ ddr_alert0: trip-point0 {
> type = "hot";
> };
>
> - ddr_crit: ddr_crit {
> + ddr_crit: ddr-crit {
> temperature = <110000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -4333,7 +4333,7 @@ q6_hvx_alert0: trip-point0 {
> type = "hot";
> };
>
> - q6_hvx_crit: q6_hvx_crit {
> + q6_hvx_crit: q6-hvx-crit {
> temperature = <110000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -4354,7 +4354,7 @@ camera_alert0: trip-point0 {
> type = "hot";
> };
>
> - camera_crit: camera_crit {
> + camera_crit: camera-crit {
> temperature = <110000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -4375,7 +4375,7 @@ mdm_alert0: trip-point0 {
> type = "hot";
> };
>
> - mdm_crit: mdm_crit {
> + mdm_crit: mdm-crit {
> temperature = <110000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -4396,7 +4396,7 @@ mdm_dsp_alert0: trip-point0 {
> type = "hot";
> };
>
> - mdm_dsp_crit: mdm_dsp_crit {
> + mdm_dsp_crit: mdm-dsp-crit {
> temperature = <110000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -4417,7 +4417,7 @@ npu_alert0: trip-point0 {
> type = "hot";
> };
>
> - npu_crit: npu_crit {
> + npu_crit: npu-crit {
> temperature = <110000>;
> hysteresis = <2000>;
> type = "critical";
> @@ -4438,7 +4438,7 @@ video_alert0: trip-point0 {
> 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 3d2b08d551d0..0259e90aad1c 100644
> --- 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 @@ vph_pwr: vph-pwr-regulator {
> 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 @@ cam_vdig_imx300_219_vreg: cam_vdig_imx300_219_vreg {
> 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 @@ cam_vana_front_vreg: cam_vana_front_vreg {
> 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 13e6a4fbba27..810f51b48dce 100644
> --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi
> @@ -2409,7 +2409,7 @@ cpu0_alert0: trip-point0 {
> type = "passive";
> };
>
> - cpu0_crit: cpu_crit {
> + cpu0_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -2430,7 +2430,7 @@ cpu1_alert0: trip-point0 {
> type = "passive";
> };
>
> - cpu1_crit: cpu_crit {
> + cpu1_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -2451,7 +2451,7 @@ cpu2_alert0: trip-point0 {
> type = "passive";
> };
>
> - cpu2_crit: cpu_crit {
> + cpu2_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -2472,7 +2472,7 @@ cpu3_alert0: trip-point0 {
> type = "passive";
> };
>
> - cpu3_crit: cpu_crit {
> + cpu3_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -2499,7 +2499,7 @@ pwr_cluster_alert0: trip-point0 {
> 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 f41c6d600ea8..4f64f4115175 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> @@ -142,7 +142,7 @@ pcie0_1p05v: pcie-0-1p05v-regulator {
> */
> };
>
> - 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 @@ cam0_dvdd_1v2: reg_cam0_dvdd_1v2 {
> 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 @@ cam0_avdd_2v8: reg_cam0_avdd_2v8 {
> };
>
> /* 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 65032b94b46d..444fe75ede13 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> @@ -5385,7 +5385,7 @@ cpu0_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu0_crit: cpu_crit {
> + cpu0_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -5412,7 +5412,7 @@ cpu1_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu1_crit: cpu_crit {
> + cpu1_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -5439,7 +5439,7 @@ cpu2_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu2_crit: cpu_crit {
> + cpu2_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -5466,7 +5466,7 @@ cpu3_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu3_crit: cpu_crit {
> + cpu3_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -5493,7 +5493,7 @@ cpu4_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu4_crit: cpu_crit {
> + cpu4_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -5520,7 +5520,7 @@ cpu5_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu5_crit: cpu_crit {
> + cpu5_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -5547,7 +5547,7 @@ cpu6_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu6_crit: cpu_crit {
> + cpu6_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -5574,7 +5574,7 @@ cpu7_alert1: trip-point1 {
> 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 0de6c5b7f742..476df4f6e58a 100644
> --- a/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
> +++ b/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
> @@ -55,7 +55,7 @@ key-vol-dn {
> };
> };
>
> - 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 a0c57fb798d3..e3997a0e3dff 100644
> --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
> @@ -4057,7 +4057,7 @@ cpu0_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu0_crit: cpu_crit {
> + cpu0_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -4101,7 +4101,7 @@ cpu1_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu1_crit: cpu_crit {
> + cpu1_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -4145,7 +4145,7 @@ cpu2_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu2_crit: cpu_crit {
> + cpu2_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -4189,7 +4189,7 @@ cpu3_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu3_crit: cpu_crit {
> + cpu3_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -4233,7 +4233,7 @@ cpu4_top_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu4_top_crit: cpu_crit {
> + cpu4_top_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -4277,7 +4277,7 @@ cpu5_top_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu5_top_crit: cpu_crit {
> + cpu5_top_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -4321,7 +4321,7 @@ cpu6_top_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu6_top_crit: cpu_crit {
> + cpu6_top_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -4365,7 +4365,7 @@ cpu7_top_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu7_top_crit: cpu_crit {
> + cpu7_top_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -4409,7 +4409,7 @@ cpu4_bottom_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu4_bottom_crit: cpu_crit {
> + cpu4_bottom_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -4453,7 +4453,7 @@ cpu5_bottom_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu5_bottom_crit: cpu_crit {
> + cpu5_bottom_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -4497,7 +4497,7 @@ cpu6_bottom_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu6_bottom_crit: cpu_crit {
> + cpu6_bottom_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -4541,7 +4541,7 @@ cpu7_bottom_alert1: trip-point1 {
> 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 dab5579946f3..46186e521aba 100644
> --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
> @@ -5500,7 +5500,7 @@ cpu0_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu0_crit: cpu_crit {
> + cpu0_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -5544,7 +5544,7 @@ cpu1_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu1_crit: cpu_crit {
> + cpu1_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -5588,7 +5588,7 @@ cpu2_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu2_crit: cpu_crit {
> + cpu2_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -5632,7 +5632,7 @@ cpu3_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu3_crit: cpu_crit {
> + cpu3_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -5676,7 +5676,7 @@ cpu4_top_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu4_top_crit: cpu_crit {
> + cpu4_top_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -5720,7 +5720,7 @@ cpu5_top_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu5_top_crit: cpu_crit {
> + cpu5_top_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -5764,7 +5764,7 @@ cpu6_top_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu6_top_crit: cpu_crit {
> + cpu6_top_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -5808,7 +5808,7 @@ cpu7_top_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu7_top_crit: cpu_crit {
> + cpu7_top_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -5852,7 +5852,7 @@ cpu4_bottom_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu4_bottom_crit: cpu_crit {
> + cpu4_bottom_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -5896,7 +5896,7 @@ cpu5_bottom_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu5_bottom_crit: cpu_crit {
> + cpu5_bottom_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -5940,7 +5940,7 @@ cpu6_bottom_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu6_bottom_crit: cpu_crit {
> + cpu6_bottom_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -5984,7 +5984,7 @@ cpu7_bottom_alert1: trip-point1 {
> 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 245dce24ec59..b41bc3b005fb 100644
> --- a/arch/arm64/boot/dts/qcom/sm8350.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi
> @@ -2728,7 +2728,7 @@ cpu0_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu0_crit: cpu_crit {
> + cpu0_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -2772,7 +2772,7 @@ cpu1_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu1_crit: cpu_crit {
> + cpu1_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -2816,7 +2816,7 @@ cpu2_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu2_crit: cpu_crit {
> + cpu2_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -2860,7 +2860,7 @@ cpu3_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu3_crit: cpu_crit {
> + cpu3_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -2904,7 +2904,7 @@ cpu4_top_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu4_top_crit: cpu_crit {
> + cpu4_top_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -2948,7 +2948,7 @@ cpu5_top_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu5_top_crit: cpu_crit {
> + cpu5_top_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -2992,7 +2992,7 @@ cpu6_top_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu6_top_crit: cpu_crit {
> + cpu6_top_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -3036,7 +3036,7 @@ cpu7_top_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu7_top_crit: cpu_crit {
> + cpu7_top_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -3080,7 +3080,7 @@ cpu4_bottom_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu4_bottom_crit: cpu_crit {
> + cpu4_bottom_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -3124,7 +3124,7 @@ cpu5_bottom_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu5_bottom_crit: cpu_crit {
> + cpu5_bottom_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -3168,7 +3168,7 @@ cpu6_bottom_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu6_bottom_crit: cpu_crit {
> + cpu6_bottom_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -3212,7 +3212,7 @@ cpu7_bottom_alert1: trip-point1 {
> 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 570475040d95..8b0a0c990392 100644
> --- a/arch/arm64/boot/dts/qcom/sm8450.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi
> @@ -3953,7 +3953,7 @@ cpu4_top_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu4_top_crit: cpu_crit {
> + cpu4_top_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -3979,7 +3979,7 @@ cpu4_bottom_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu4_bottom_crit: cpu_crit {
> + cpu4_bottom_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -4005,7 +4005,7 @@ cpu5_top_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu5_top_crit: cpu_crit {
> + cpu5_top_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -4031,7 +4031,7 @@ cpu5_bottom_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu5_bottom_crit: cpu_crit {
> + cpu5_bottom_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -4057,7 +4057,7 @@ cpu6_top_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu6_top_crit: cpu_crit {
> + cpu6_top_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -4083,7 +4083,7 @@ cpu6_bottom_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu6_bottom_crit: cpu_crit {
> + cpu6_bottom_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -4109,7 +4109,7 @@ cpu7_top_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu7_top_crit: cpu_crit {
> + cpu7_top_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -4135,7 +4135,7 @@ cpu7_middle_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu7_middle_crit: cpu_crit {
> + cpu7_middle_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -4161,7 +4161,7 @@ cpu7_bottom_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu7_bottom_crit: cpu_crit {
> + cpu7_bottom_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -4193,7 +4193,7 @@ reset-mon-cfg {
> type = "passive";
> };
>
> - gpu0_tj_cfg: tj_cfg {
> + gpu0_tj_cfg: tj-cfg {
> temperature = <95000>;
> hysteresis = <5000>;
> type = "passive";
> @@ -4225,7 +4225,7 @@ reset-mon-cfg {
> type = "passive";
> };
>
> - gpu1_tj_cfg: tj_cfg {
> + gpu1_tj_cfg: tj-cfg {
> temperature = <95000>;
> hysteresis = <5000>;
> type = "passive";
> @@ -4271,7 +4271,7 @@ cpu0_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu0_crit: cpu_crit {
> + cpu0_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -4297,7 +4297,7 @@ cpu1_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu1_crit: cpu_crit {
> + cpu1_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -4323,7 +4323,7 @@ cpu2_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu2_crit: cpu_crit {
> + cpu2_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
> @@ -4349,7 +4349,7 @@ cpu3_alert1: trip-point1 {
> type = "passive";
> };
>
> - cpu3_crit: cpu_crit {
> + cpu3_crit: cpu-crit {
> temperature = <110000>;
> hysteresis = <1000>;
> type = "critical";
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] arm64: dts: qcom: replace underscores in node names
2022-12-14 11:04 [PATCH] arm64: dts: qcom: replace underscores in node names Krzysztof Kozlowski
2022-12-14 11:45 ` Konrad Dybcio
@ 2023-01-11 5:09 ` Bjorn Andersson
1 sibling, 0 replies; 6+ messages in thread
From: Bjorn Andersson @ 2023-01-11 5:09 UTC (permalink / raw)
To: Krzysztof Kozlowski, konrad.dybcio, devicetree, agross,
linux-kernel, linux-arm-msm, krzysztof.kozlowski+dt, robh+dt
On Wed, 14 Dec 2022 12:04:48 +0100, Krzysztof Kozlowski wrote:
> 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).
>
>
Applied, thanks!
[1/1] arm64: dts: qcom: replace underscores in node names
commit: 1364acc3f6260c51c6dd201c9b8e2fc58a6ca80d
Best regards,
--
Bjorn Andersson <andersson@kernel.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] arm64: dts: qcom: replace underscores in node names
@ 2024-02-13 14:51 Krzysztof Kozlowski
2024-02-13 21:09 ` Doug Anderson
2024-02-20 17:57 ` Bjorn Andersson
0 siblings, 2 replies; 6+ messages in thread
From: Krzysztof Kozlowski @ 2024-02-13 14:51 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, cros-qcom-dts-watchers, linux-arm-msm, devicetree,
linux-kernel
Cc: Krzysztof Kozlowski
Underscores should not be used in node names (dtc with W=2 warns about
them), so replace them with hyphens.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
arch/arm64/boot/dts/qcom/msm8939.dtsi | 2 +-
.../boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 2 +-
.../dts/qcom/msm8994-sony-xperia-kitakami.dtsi | 2 +-
arch/arm64/boot/dts/qcom/msm8994.dtsi | 4 ++--
arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 ++--
arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 2 +-
arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 2 +-
arch/arm64/boot/dts/qcom/sc7180.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 2 +-
arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 ++--
arch/arm64/boot/dts/qcom/sm6115.dtsi | 14 +++++++-------
arch/arm64/boot/dts/qcom/sm8150.dtsi | 10 +++++-----
arch/arm64/boot/dts/qcom/sm8250.dtsi | 6 +++---
arch/arm64/boot/dts/qcom/sm8350.dtsi | 4 ++--
15 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8939.dtsi b/arch/arm64/boot/dts/qcom/msm8939.dtsi
index 48c8601ff7b7..dd45975682b2 100644
--- a/arch/arm64/boot/dts/qcom/msm8939.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8939.dtsi
@@ -2472,7 +2472,7 @@ gpu_alert0: trip-point0 {
type = "passive";
};
- gpu_crit: gpu_crit {
+ gpu_crit: gpu-crit {
temperature = <95000>;
hysteresis = <2000>;
type = "critical";
diff --git a/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi b/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi
index cbc84459a5ae..10cd244dea4f 100644
--- a/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi
@@ -377,7 +377,7 @@ &blsp1_uart2 {
&blsp2_i2c1 {
status = "okay";
- sideinteraction: ad7147_captouch@2c {
+ sideinteraction: touch@2c {
compatible = "ad,ad7147_captouch";
reg = <0x2c>;
diff --git a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
index 9dbde79f26a2..0163d41f95f8 100644
--- a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
@@ -79,7 +79,7 @@ ramoops@1fe00000 {
pmsg-size = <0x80000>;
};
- fb_region: fb_region@40000000 {
+ fb_region: fb@40000000 {
reg = <0 0x40000000 0 0x1000000>;
no-map;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qcom/msm8994.dtsi
index 8295bf1b219d..695e541832ad 100644
--- a/arch/arm64/boot/dts/qcom/msm8994.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi
@@ -233,7 +233,7 @@ reserved-memory {
#size-cells = <2>;
ranges;
- dfps_data_mem: dfps_data_mem@3400000 {
+ dfps_data_mem: dfps-data@3400000 {
reg = <0 0x03400000 0 0x1000>;
no-map;
};
@@ -243,7 +243,7 @@ cont_splash_mem: memory@3401000 {
no-map;
};
- smem_mem: smem_region@6a00000 {
+ smem_mem: smem@6a00000 {
reg = <0 0x06a00000 0 0x200000>;
no-map;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index a691913b78a0..f034985d2747 100644
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -782,12 +782,12 @@ qfprom@74000 {
#address-cells = <1>;
#size-cells = <1>;
- qusb2p_hstx_trim: hstx_trim@24e {
+ qusb2p_hstx_trim: hstx-trim@24e {
reg = <0x24e 0x2>;
bits = <5 4>;
};
- qusb2s_hstx_trim: hstx_trim@24f {
+ qusb2s_hstx_trim: hstx-trim@24f {
reg = <0x24f 0x1>;
bits = <1 4>;
};
diff --git a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts
index acf145d1d97c..66ca7bb7eb58 100644
--- a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts
+++ b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts
@@ -115,7 +115,7 @@ qtee_mem: qtee@c1300000 {
no-map;
};
- trusted_apps_mem: trusted_apps@c1800000 {
+ trusted_apps_mem: trusted-apps@c1800000 {
reg = <0x0 0xc1800000 0x0 0x1c00000>;
no-map;
};
diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
index 8bb7d13d85f6..30657d6fd539 100644
--- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
+++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
@@ -110,7 +110,7 @@ qtee_mem: qtee@c1300000 {
no-map;
};
- trusted_apps_mem: trusted_apps@c1800000 {
+ trusted_apps_mem: trusted-apps@c1800000 {
reg = <0x0 0xc1800000 0x0 0x1c00000>;
no-map;
};
diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
index ed2e54988daf..2b481e20ae38 100644
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -817,7 +817,7 @@ qusb2p_hstx_trim: hstx-trim-primary@25b {
bits = <1 3>;
};
- gpu_speed_bin: gpu_speed_bin@1d2 {
+ gpu_speed_bin: gpu-speed-bin@1d2 {
reg = <0x1d2 0x2>;
bits = <5 8>;
};
diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
index 581818676a4c..2f2e32a5ebd7 100644
--- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
@@ -980,7 +980,7 @@ qfprom: efuse@784000 {
#address-cells = <1>;
#size-cells = <1>;
- gpu_speed_bin: gpu_speed_bin@1e9 {
+ gpu_speed_bin: gpu-speed-bin@1e9 {
reg = <0x1e9 0x2>;
bits = <5 8>;
};
diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
index fbb8655653fb..486ce175e6bc 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
@@ -60,7 +60,7 @@ key-vol-up {
};
reserved-memory {
- framebuffer_region@9d400000 {
+ framebuffer@9d400000 {
reg = <0x0 0x9d400000 0x0 (1080 * 2160 * 4)>;
no-map;
};
diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index d655bf5bdb96..df0152a1279d 100644
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -5579,7 +5579,7 @@ cluster0_alert0: trip-point0 {
hysteresis = <2000>;
type = "hot";
};
- cluster0_crit: cluster0_crit {
+ cluster0_crit: cluster0-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -5599,7 +5599,7 @@ cluster1_alert0: trip-point0 {
hysteresis = <2000>;
type = "hot";
};
- cluster1_crit: cluster1_crit {
+ cluster1_crit: cluster1-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qcom/sm6115.dtsi
index c944be23866d..6cd86a833234 100644
--- a/arch/arm64/boot/dts/qcom/sm6115.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi
@@ -3106,7 +3106,7 @@ cpu4_alert1: trip-point1 {
type = "passive";
};
- cpu4_crit: cpu_crit {
+ cpu4_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -3132,7 +3132,7 @@ cpu5_alert1: trip-point1 {
type = "passive";
};
- cpu5_crit: cpu_crit {
+ cpu5_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -3158,7 +3158,7 @@ cpu6_alert1: trip-point1 {
type = "passive";
};
- cpu6_crit: cpu_crit {
+ cpu6_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -3184,7 +3184,7 @@ cpu7_alert1: trip-point1 {
type = "passive";
};
- cpu7_crit: cpu_crit {
+ cpu7_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -3210,7 +3210,7 @@ cpu45_alert1: trip-point1 {
type = "passive";
};
- cpu45_crit: cpu_crit {
+ cpu45_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -3236,7 +3236,7 @@ cpu67_alert1: trip-point1 {
type = "passive";
};
- cpu67_crit: cpu_crit {
+ cpu67_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
@@ -3262,7 +3262,7 @@ cpu0123_alert1: trip-point1 {
type = "passive";
};
- cpu0123_crit: cpu_crit {
+ cpu0123_crit: cpu-crit {
temperature = <110000>;
hysteresis = <1000>;
type = "critical";
diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi
index eb1acea2631b..e393bf6eea75 100644
--- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
@@ -967,7 +967,7 @@ qfprom: efuse@784000 {
#address-cells = <1>;
#size-cells = <1>;
- gpu_speed_bin: gpu_speed_bin@133 {
+ gpu_speed_bin: gpu-speed-bin@133 {
reg = <0x133 0x1>;
bits = <5 3>;
};
@@ -2463,7 +2463,7 @@ qup_i2c6_default: qup-i2c6-default-state {
bias-disable;
};
- qup_spi6_default: qup-spi6_default-state {
+ qup_spi6_default: qup-spi6-default-state {
pins = "gpio4", "gpio5", "gpio6", "gpio7";
function = "qup6";
drive-strength = <6>;
@@ -2477,7 +2477,7 @@ qup_i2c7_default: qup-i2c7-default-state {
bias-disable;
};
- qup_spi7_default: qup-spi7_default-state {
+ qup_spi7_default: qup-spi7-default-state {
pins = "gpio98", "gpio99", "gpio100", "gpio101";
function = "qup7";
drive-strength = <6>;
@@ -5110,7 +5110,7 @@ cluster0_alert0: trip-point0 {
hysteresis = <2000>;
type = "hot";
};
- cluster0_crit: cluster0_crit {
+ cluster0_crit: cluster0-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -5130,7 +5130,7 @@ cluster1_alert0: trip-point0 {
hysteresis = <2000>;
type = "hot";
};
- cluster1_crit: cluster1_crit {
+ cluster1_crit: cluster1-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
index f3c70b87efad..39bd8f0eba1e 100644
--- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
@@ -975,7 +975,7 @@ qfprom: efuse@784000 {
#address-cells = <1>;
#size-cells = <1>;
- gpu_speed_bin: gpu_speed_bin@19b {
+ gpu_speed_bin: gpu-speed-bin@19b {
reg = <0x19b 0x1>;
bits = <5 3>;
};
@@ -6798,7 +6798,7 @@ cluster0_alert0: trip-point0 {
hysteresis = <2000>;
type = "hot";
};
- cluster0_crit: cluster0_crit {
+ cluster0_crit: cluster0-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -6818,7 +6818,7 @@ cluster1_alert0: trip-point0 {
hysteresis = <2000>;
type = "hot";
};
- cluster1_crit: cluster1_crit {
+ cluster1_crit: cluster1-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi
index 65d425f56583..a5e7dbbd8c6c 100644
--- a/arch/arm64/boot/dts/qcom/sm8350.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi
@@ -4192,7 +4192,7 @@ cluster0_alert0: trip-point0 {
hysteresis = <2000>;
type = "hot";
};
- cluster0_crit: cluster0_crit {
+ cluster0_crit: cluster0-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
@@ -4212,7 +4212,7 @@ cluster1_alert0: trip-point0 {
hysteresis = <2000>;
type = "hot";
};
- cluster1_crit: cluster1_crit {
+ cluster1_crit: cluster1-crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] arm64: dts: qcom: replace underscores in node names
2024-02-13 14:51 Krzysztof Kozlowski
@ 2024-02-13 21:09 ` Doug Anderson
2024-02-20 17:57 ` Bjorn Andersson
1 sibling, 0 replies; 6+ messages in thread
From: Doug Anderson @ 2024-02-13 21:09 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, cros-qcom-dts-watchers, linux-arm-msm, devicetree,
linux-kernel
Hi,
On Tue, Feb 13, 2024 at 6:51 AM Krzysztof Kozlowski
<krzysztof.kozlowski@linaro.org> wrote:
>
> Underscores should not be used in node names (dtc with W=2 warns about
> them), so replace them with hyphens.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
> arch/arm64/boot/dts/qcom/msm8939.dtsi | 2 +-
> .../boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 2 +-
> .../dts/qcom/msm8994-sony-xperia-kitakami.dtsi | 2 +-
> arch/arm64/boot/dts/qcom/msm8994.dtsi | 4 ++--
> arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 ++--
> arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 2 +-
> arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180.dtsi | 2 +-
> arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 +-
> arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 2 +-
> arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 ++--
> arch/arm64/boot/dts/qcom/sm6115.dtsi | 14 +++++++-------
> arch/arm64/boot/dts/qcom/sm8150.dtsi | 10 +++++-----
> arch/arm64/boot/dts/qcom/sm8250.dtsi | 6 +++---
> arch/arm64/boot/dts/qcom/sm8350.dtsi | 4 ++--
> 15 files changed, 31 insertions(+), 31 deletions(-)
FWIW, everything here looks reasonable to me. Thanks for the cleanup!
Reviewed-by: Douglas Anderson <dianders@chromium.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] arm64: dts: qcom: replace underscores in node names
2024-02-13 14:51 Krzysztof Kozlowski
2024-02-13 21:09 ` Doug Anderson
@ 2024-02-20 17:57 ` Bjorn Andersson
1 sibling, 0 replies; 6+ messages in thread
From: Bjorn Andersson @ 2024-02-20 17:57 UTC (permalink / raw)
To: Konrad Dybcio, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
cros-qcom-dts-watchers, linux-arm-msm, devicetree, linux-kernel,
Krzysztof Kozlowski
On Tue, 13 Feb 2024 15:51:24 +0100, Krzysztof Kozlowski wrote:
> Underscores should not be used in node names (dtc with W=2 warns about
> them), so replace them with hyphens.
>
>
Applied, thanks!
[1/1] arm64: dts: qcom: replace underscores in node names
commit: 408e177651614977032e66091ebd26f9b948e64b
Best regards,
--
Bjorn Andersson <andersson@kernel.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-02-20 17:57 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-14 11:04 [PATCH] arm64: dts: qcom: replace underscores in node names Krzysztof Kozlowski
2022-12-14 11:45 ` Konrad Dybcio
2023-01-11 5:09 ` Bjorn Andersson
-- strict thread matches above, loose matches on Subject: below --
2024-02-13 14:51 Krzysztof Kozlowski
2024-02-13 21:09 ` Doug Anderson
2024-02-20 17:57 ` Bjorn Andersson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).