arm64: dts: qcom: patch mahua thermal zones by label

Updating DT nodes by the full path is fragile and frowned upon, it's
easy to miss the rename of the node in the main tree. Add necessary
labels and patch thermal zones for Mahua using those labels.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Reviewed-by: Abel Vesa <abel.vesa@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20260320-mahua-fix-thermals-v1-1-8957bf976c90@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

2 files changed, 148 insertions, 149 deletions

diff --git a/arch/arm64/boot/dts/qcom/glymur.dtsi b/arch/arm64/boot/dts/qcom/glymur.dtsi
index dc897fe1c8de..f23cf81ddb77 100644
--- a/arch/arm64/boot/dts/qcom/glymur.dtsi
+++ b/arch/arm64/boot/dts/qcom/glymur.dtsi
@@ -6184,7 +6184,7 @@
 			};
 		};
 
-		video-0-thermal {
+		thermal_video_0: video-0-thermal {
 			thermal-sensors = <&tsens1 7>;
 
 			trips {
@@ -6196,7 +6196,7 @@
 			};
 		};
 
-		video-1-thermal {
+		thermal_video_1: video-1-thermal {
 			thermal-sensors = <&tsens1 8>;
 
 			trips {
@@ -6472,7 +6472,7 @@
 			};
 		};
 
-		cpu-2-0-0-thermal {
+		thermal_cpu_2_0_0: cpu-2-0-0-thermal {
 			thermal-sensors = <&tsens4 1>;
 
 			trips {
@@ -6484,7 +6484,7 @@
 			};
 		};
 
-		cpu-2-0-1-thermal {
+		thermal_cpu_2_0_1: cpu-2-0-1-thermal {
 			thermal-sensors = <&tsens4 2>;
 
 			trips {
@@ -6496,7 +6496,7 @@
 			};
 		};
 
-		cpu-2-1-0-thermal {
+		thermal_cpu_2_1_0: cpu-2-1-0-thermal {
 			thermal-sensors = <&tsens4 3>;
 
 			trips {
@@ -6508,7 +6508,7 @@
 			};
 		};
 
-		cpu-2-1-1-thermal {
+		thermal_cpu_2_1_1: cpu-2-1-1-thermal {
 			thermal-sensors = <&tsens4 4>;
 
 			trips {
@@ -6520,7 +6520,7 @@
 			};
 		};
 
-		cpu-2-2-0-thermal {
+		thermal_cpu_2_2_0: cpu-2-2-0-thermal {
 			thermal-sensors = <&tsens4 5>;
 
 			trips {
@@ -6532,7 +6532,7 @@
 			};
 		};
 
-		cpu-2-2-1-thermal {
+		thermal_cpu_2_2_1: cpu-2-2-1-thermal {
 			thermal-sensors = <&tsens4 6>;
 
 			trips {
@@ -6544,7 +6544,7 @@
 			};
 		};
 
-		cpu-2-3-0-thermal {
+		thermal_cpu_2_3_0: cpu-2-3-0-thermal {
 			thermal-sensors = <&tsens4 7>;
 
 			trips {
@@ -6556,7 +6556,7 @@
 			};
 		};
 
-		cpu-2-3-1-thermal {
+		thermal_cpu_2_3_1: cpu-2-3-1-thermal {
 			thermal-sensors = <&tsens4 8>;
 
 			trips {
@@ -6568,7 +6568,7 @@
 			};
 		};
 
-		cpu-2-4-0-thermal {
+		thermal_cpu_2_4_0: cpu-2-4-0-thermal {
 			thermal-sensors = <&tsens4 9>;
 
 			trips {
@@ -6580,7 +6580,7 @@
 			};
 		};
 
-		cpu-2-4-1-thermal {
+		thermal_cpu_2_4_1: cpu-2-4-1-thermal {
 			thermal-sensors = <&tsens4 10>;
 
 			trips {
@@ -6592,7 +6592,7 @@
 			};
 		};
 
-		cpu-2-5-0-thermal {
+		thermal_cpu_2_5_0: cpu-2-5-0-thermal {
 			thermal-sensors = <&tsens4 11>;
 
 			trips {
@@ -6604,7 +6604,7 @@
 			};
 		};
 
-		cpu-2-5-1-thermal {
+		thermal_cpu_2_5_1: cpu-2-5-1-thermal {
 			thermal-sensors = <&tsens4 12>;
 
 			trips {
@@ -6628,7 +6628,7 @@
 			};
 		};
 
-		cpullc-2-0-thermal {
+		thermal_cpullc_2_0: cpullc-2-0-thermal {
 			thermal-sensors = <&tsens5 1>;
 
 			trips {
@@ -6640,7 +6640,7 @@
 			};
 		};
 
-		cpuillc-2-1-thermal {
+		thermal_cpuillc_2_1: cpuillc-2-1-thermal {
 			thermal-sensors = <&tsens5 2>;
 
 			trips {
@@ -6652,7 +6652,7 @@
 			};
 		};
 
-		qmx-2-0-thermal {
+		thermal_qmx_2_0: qmx-2-0-thermal {
 			thermal-sensors = <&tsens5 3>;
 
 			trips {
@@ -6664,7 +6664,7 @@
 			};
 		};
 
-		qmx-2-1-thermal {
+		thermal_qmx_2_1: qmx-2-1-thermal {
 			thermal-sensors = <&tsens5 4>;
 
 			trips {
@@ -6676,7 +6676,7 @@
 			};
 		};
 
-		qmx-2-2-thermal {
+		thermal_qmx_2_2: qmx-2-2-thermal {
 			thermal-sensors = <&tsens5 5>;
 
 			trips {
@@ -6688,7 +6688,7 @@
 			};
 		};
 
-		qmx-2-3-thermal {
+		thermal_qmx_2_3: qmx-2-3-thermal {
 			thermal-sensors = <&tsens5 6>;
 
 			trips {
@@ -6700,7 +6700,7 @@
 			};
 		};
 
-		qmx-2-4-thermal {
+		thermal_qmx_2_4: qmx-2-4-thermal {
 			thermal-sensors = <&tsens5 7>;
 
 			trips {
@@ -6712,7 +6712,7 @@
 			};
 		};
 
-		aoss-6-thermal {
+		thermal_aoss_6: aoss-6-thermal {
 			thermal-sensors = <&tsens6 0>;
 
 			trips {
@@ -6724,7 +6724,7 @@
 			};
 		};
 
-		nsphvx-0-thermal {
+		thermal_nsphvx_0: nsphvx-0-thermal {
 			thermal-sensors = <&tsens6 1>;
 
 			trips {
@@ -6736,7 +6736,7 @@
 			};
 		};
 
-		nsphvx-1-thermal {
+		thermal_nsphvx_1: nsphvx-1-thermal {
 			thermal-sensors = <&tsens6 2>;
 
 			trips {
@@ -6748,7 +6748,7 @@
 			};
 		};
 
-		nsphvx-2-thermal {
+		thermal_nsphvx_2: nsphvx-2-thermal {
 			thermal-sensors = <&tsens6 3>;
 
 			trips {
@@ -6760,7 +6760,7 @@
 			};
 		};
 
-		nsphvx-3-thermal {
+		thermal_nsphvx_3: nsphvx-3-thermal {
 			thermal-sensors = <&tsens6 4>;
 
 			trips {
@@ -6772,7 +6772,7 @@
 			};
 		};
 
-		nsphmx-0-thermal {
+		thermal_nsphmx_0: nsphmx-0-thermal {
 			thermal-sensors = <&tsens6 5>;
 
 			trips {
@@ -6784,7 +6784,7 @@
 			};
 		};
 
-		nsphmx-1-thermal {
+		thermal_nsphmx_1: nsphmx-1-thermal {
 			thermal-sensors = <&tsens6 6>;
 
 			trips {
@@ -6796,7 +6796,7 @@
 			};
 		};
 
-		nsphmx-2-thermal {
+		thermal_nsphmx_2: nsphmx-2-thermal {
 			thermal-sensors = <&tsens6 7>;
 
 			trips {
@@ -6808,7 +6808,7 @@
 			};
 		};
 
-		nsphmx-3-thermal {
+		thermal_nsphmx_3: nsphmx-3-thermal {
 			thermal-sensors = <&tsens6 8>;
 
 			trips {
@@ -6820,7 +6820,7 @@
 			};
 		};
 
-		camera-0-thermal {
+		thermal_camera_0: camera-0-thermal {
 			thermal-sensors = <&tsens6 9>;
 
 			trips {
@@ -6832,7 +6832,7 @@
 			};
 		};
 
-		camera-1-thermal {
+		thermal_camera_1: camera-1-thermal {
 			thermal-sensors = <&tsens6 10>;
 
 			trips {
@@ -6844,7 +6844,7 @@
 			};
 		};
 
-		ddr-1-thermal {
+		thermal_ddr_1: ddr-1-thermal {
 			thermal-sensors = <&tsens6 11>;
 
 			trips {
@@ -6856,7 +6856,7 @@
 			};
 		};
 
-		ddr-2-thermal {
+		thermal_ddr_2: ddr-2-thermal {
 			thermal-sensors = <&tsens6 12>;
 
 			trips {
@@ -6868,7 +6868,7 @@
 			};
 		};
 
-		aoss-7-thermal {
+		thermal_aoss_7: aoss-7-thermal {
 			thermal-sensors = <&tsens7 0>;
 
 			trips {
@@ -6880,7 +6880,7 @@
 			};
 		};
 
-		gpu-0-0-thermal {
+		thermal_gpu_0_0: gpu-0-0-thermal {
 			thermal-sensors = <&tsens7 1>;
 
 			trips {
@@ -6898,7 +6898,7 @@
 			};
 		};
 
-		gpu-0-1-thermal {
+		thermal_gpu_0_1: gpu-0-1-thermal {
 			thermal-sensors = <&tsens7 2>;
 
 			trips {
@@ -6916,7 +6916,7 @@
 			};
 		};
 
-		gpu-0-2-thermal {
+		thermal_gpu_0_2: gpu-0-2-thermal {
 			thermal-sensors = <&tsens7 3>;
 
 			trips {
@@ -6934,7 +6934,7 @@
 			};
 		};
 
-		gpu-1-0-thermal {
+		thermal_gpu_1_0: gpu-1-0-thermal {
 			thermal-sensors = <&tsens7 4>;
 
 			trips {
@@ -6952,7 +6952,7 @@
 			};
 		};
 
-		gpu-1-1-thermal {
+		thermal_gpu_1_1: gpu-1-1-thermal {
 			thermal-sensors = <&tsens7 5>;
 
 			trips {
@@ -6970,7 +6970,7 @@
 			};
 		};
 
-		gpu-1-2-thermal {
+		thermal_gpu_1_2: gpu-1-2-thermal {
 			thermal-sensors = <&tsens7 6>;
 
 			trips {
@@ -6988,7 +6988,7 @@
 			};
 		};
 
-		gpu-2-0-thermal {
+		thermal_gpu_2_0: gpu-2-0-thermal {
 			thermal-sensors = <&tsens7 7>;
 
 			trips {
@@ -7006,7 +7006,7 @@
 			};
 		};
 
-		gpu-2-1-thermal {
+		thermal_gpu_2_1: gpu-2-1-thermal {
 			thermal-sensors = <&tsens7 8>;
 
 			trips {
@@ -7024,7 +7024,7 @@
 			};
 		};
 
-		gpu-2-2-thermal {
+		thermal_gpu_2_2: gpu-2-2-thermal {
 			thermal-sensors = <&tsens7 9>;
 
 			trips {
@@ -7042,7 +7042,7 @@
 			};
 		};
 
-		gpu-3-0-thermal {
+		thermal_gpu_3_0: gpu-3-0-thermal {
 			thermal-sensors = <&tsens7 10>;
 
 			trips {
@@ -7060,7 +7060,7 @@
 			};
 		};
 
-		gpu-3-1-thermal {
+		thermal_gpu_3_1: gpu-3-1-thermal {
 			thermal-sensors = <&tsens7 11>;
 
 			trips {
@@ -7078,7 +7078,7 @@
 			};
 		};
 
-		gpu-3-2-thermal {
+		thermal_gpu_3_2: gpu-3-2-thermal {
 			thermal-sensors = <&tsens7 12>;
 
 			trips {
@@ -7096,7 +7096,7 @@
 			};
 		};
 
-		gpuss-0-thermal {
+		thermal_gpuss_0: gpuss-0-thermal {
 			thermal-sensors = <&tsens7 13>;
 
 			trips {
@@ -7114,7 +7114,7 @@
 			};
 		};
 
-		gpuss-1-thermal {
+		thermal_gpuss_1: gpuss-1-thermal {
 			thermal-sensors = <&tsens7 14>;
 
 			trips {
diff --git a/arch/arm64/boot/dts/qcom/mahua.dtsi b/arch/arm64/boot/dts/qcom/mahua.dtsi
index 460285e783ba..990a02c6afc1 100644
--- a/arch/arm64/boot/dts/qcom/mahua.dtsi
+++ b/arch/arm64/boot/dts/qcom/mahua.dtsi
@@ -21,6 +21,32 @@
 /delete-node/ &cpu_pd15;
 /delete-node/ &cpu_pd16;
 /delete-node/ &cpu_pd17;
+/delete-node/ &thermal_aoss_6;
+/delete-node/ &thermal_aoss_7;
+/delete-node/ &thermal_cpu_2_0_0;
+/delete-node/ &thermal_cpu_2_0_1;
+/delete-node/ &thermal_cpu_2_1_0;
+/delete-node/ &thermal_cpu_2_1_1;
+/delete-node/ &thermal_cpu_2_2_0;
+/delete-node/ &thermal_cpu_2_2_1;
+/delete-node/ &thermal_cpu_2_3_0;
+/delete-node/ &thermal_cpu_2_3_1;
+/delete-node/ &thermal_cpu_2_4_0;
+/delete-node/ &thermal_cpu_2_4_1;
+/delete-node/ &thermal_cpu_2_5_0;
+/delete-node/ &thermal_cpu_2_5_1;
+/delete-node/ &thermal_cpuillc_2_1;
+/delete-node/ &thermal_cpullc_2_0;
+/delete-node/ &thermal_ddr_2;
+/delete-node/ &thermal_gpu_3_0;
+/delete-node/ &thermal_gpu_3_1;
+/delete-node/ &thermal_gpu_3_2;
+/delete-node/ &thermal_qmx_2_0;
+/delete-node/ &thermal_qmx_2_1;
+/delete-node/ &thermal_qmx_2_2;
+/delete-node/ &thermal_qmx_2_3;
+/delete-node/ &thermal_qmx_2_4;
+/delete-node/ &thermal_video_1;
 /delete-node/ &tsens6;
 /delete-node/ &tsens7;
 
@@ -111,130 +137,99 @@
 	compatible = "qcom,mahua-system-noc", "qcom,glymur-system-noc";
 };
 
-&tlmm {
-	compatible = "qcom,mahua-tlmm";
+&thermal_camera_0 {
+	thermal-sensors = <&tsens4 9>;
 };
 
-&thermal_zones {
-	/delete-node/ aoss-6-thermal;
-	/delete-node/ aoss-7-thermal;
-	/delete-node/ cpu-2-0-0-thermal;
-	/delete-node/ cpu-2-0-1-thermal;
-	/delete-node/ cpu-2-1-0-thermal;
-	/delete-node/ cpu-2-1-1-thermal;
-	/delete-node/ cpu-2-2-0-thermal;
-	/delete-node/ cpu-2-2-1-thermal;
-	/delete-node/ cpu-2-3-0-thermal;
-	/delete-node/ cpu-2-3-1-thermal;
-	/delete-node/ cpu-2-4-0-thermal;
-	/delete-node/ cpu-2-4-1-thermal;
-	/delete-node/ cpu-2-5-0-thermal;
-	/delete-node/ cpu-2-5-1-thermal;
-	/delete-node/ cpullc-2-0-thermal;
-	/delete-node/ cpuillc-2-1-thermal;
-	/delete-node/ ddr-2-thermal;
-	/delete-node/ gpu-3-0-thermal;
-	/delete-node/ gpu-3-1-thermal;
-	/delete-node/ gpu-3-2-thermal;
-	/delete-node/ qmx-2-0-thermal;
-	/delete-node/ qmx-2-1-thermal;
-	/delete-node/ qmx-2-2-thermal;
-	/delete-node/ qmx-2-3-thermal;
-	/delete-node/ qmx-2-4-thermal;
-	/delete-node/ video-1-thermal;
-
-	ddr-1-thermal {
-		thermal-sensors = <&tsens1 7>;
-	};
-
-	video-0-thermal {
-		thermal-sensors = <&tsens1 8>;
-	};
+&thermal_camera_1 {
+	thermal-sensors = <&tsens4 10>;
+};
 
-	nsphvx-0-thermal {
-		thermal-sensors = <&tsens4 1>;
-	};
+&thermal_ddr_1 {
+	thermal-sensors = <&tsens1 7>;
+};
 
-	nsphvx-1-thermal {
-		thermal-sensors = <&tsens4 2>;
-	};
+&thermal_gpu_0_0 {
+	thermal-sensors = <&tsens5 1>;
+};
 
-	nsphvx-2-thermal {
-		thermal-sensors = <&tsens4 3>;
-	};
+&thermal_gpu_0_1 {
+	thermal-sensors = <&tsens5 2>;
+};
 
-	nsphvx-3-thermal {
-		thermal-sensors = <&tsens4 4>;
-	};
+&thermal_gpu_0_2 {
+	thermal-sensors = <&tsens5 3>;
+};
 
-	nsphmx-0-thermal {
-		thermal-sensors = <&tsens4 5>;
-	};
+&thermal_gpu_1_0 {
+	thermal-sensors = <&tsens5 4>;
+};
 
-	nsphmx-1-thermal {
-		thermal-sensors = <&tsens4 6>;
-	};
+&thermal_gpu_1_1 {
+	thermal-sensors = <&tsens5 5>;
+};
 
-	nsphmx-2-thermal {
-		thermal-sensors = <&tsens4 7>;
-	};
+&thermal_gpu_1_2 {
+	thermal-sensors = <&tsens5 6>;
+};
 
-	nsphmx-3-thermal {
-		thermal-sensors = <&tsens4 8>;
-	};
+&thermal_gpu_2_0 {
+	thermal-sensors = <&tsens5 7>;
+};
 
-	camera-0-thermal {
-		thermal-sensors = <&tsens4 9>;
-	};
+&thermal_gpu_2_1 {
+	thermal-sensors = <&tsens5 8>;
+};
 
-	camera-1-thermal {
-		thermal-sensors = <&tsens4 10>;
-	};
+&thermal_gpu_2_2 {
+	thermal-sensors = <&tsens5 9>;
+};
 
-	gpu-0-0-thermal {
-		thermal-sensors = <&tsens5 1>;
-	};
+&thermal_gpuss_0 {
+	thermal-sensors = <&tsens5 10>;
+};
 
-	gpu-0-1-thermal {
-		thermal-sensors = <&tsens5 2>;
-	};
+&thermal_gpuss_1 {
+	thermal-sensors = <&tsens5 11>;
+};
 
-	gpu-0-2-thermal {
-		thermal-sensors = <&tsens5 3>;
-	};
+&thermal_nsphmx_0 {
+	thermal-sensors = <&tsens4 5>;
+};
 
-	gpu-1-0-thermal {
-		thermal-sensors = <&tsens5 4>;
-	};
+&thermal_nsphmx_1 {
+	thermal-sensors = <&tsens4 6>;
+};
 
-	gpu-1-1-thermal {
-		thermal-sensors = <&tsens5 5>;
-	};
+&thermal_nsphmx_2 {
+	thermal-sensors = <&tsens4 7>;
+};
 
-	gpu-1-2-thermal {
-		thermal-sensors = <&tsens5 6>;
-	};
+&thermal_nsphmx_3 {
+	thermal-sensors = <&tsens4 8>;
+};
 
-	gpu-2-0-thermal {
-		thermal-sensors = <&tsens5 7>;
-	};
+&thermal_nsphvx_0 {
+	thermal-sensors = <&tsens4 1>;
+};
 
-	gpu-2-1-thermal {
-		thermal-sensors = <&tsens5 8>;
-	};
+&thermal_nsphvx_1 {
+	thermal-sensors = <&tsens4 2>;
+};
 
-	gpu-2-2-thermal {
-		thermal-sensors = <&tsens5 9>;
-	};
+&thermal_nsphvx_2 {
+	thermal-sensors = <&tsens4 3>;
+};
 
-	gpuss-0-thermal {
-		thermal-sensors = <&tsens5 10>;
-	};
+&thermal_nsphvx_3 {
+	thermal-sensors = <&tsens4 4>;
+};
 
-	gpuss-1-thermal {
-		thermal-sensors = <&tsens5 11>;
-	};
+&thermal_video_0 {
+	thermal-sensors = <&tsens1 8>;
+};
 
+&thermal_zones {
 	gpuss-2-thermal {
 		thermal-sensors = <&tsens5 12>;
 
@@ -290,6 +285,10 @@
 	};
 };
 
+&tlmm {
+	compatible = "qcom,mahua-tlmm";
+};
+
 &tsens4 {
 	#qcom,sensors = <11>;
 };