Patch "ARM: dts: exynos: Override thermal by label in Exynos5250" has been added to the 5.4-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    ARM: dts: exynos: Override thermal by label in Exynos5250

to the 5.4-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     arm-dts-exynos-override-thermal-by-label-in-exynos52.patch
and it can be found in the queue-5.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit f5f62ff385b0977362ad4ef89affd9a38ed0a7f7
Author: Krzysztof Kozlowski <krzk@xxxxxxxxxx>
Date:   Tue Sep 1 09:54:11 2020 +0200

    ARM: dts: exynos: Override thermal by label in Exynos5250
    
    [ Upstream commit 7e86ef5cc89609cbad8b9dd2f476789c638dbb92 ]
    
    Using full paths to extend or override a device tree node is error prone
    since if there was a typo error, a new node will be created instead of
    extending the node as it was desired.  This will lead to run-time errors
    that could be hard to detect.
    
    A mistyped label on the other hand, will cause a dtc compile error
    (during build time).
    
    Signed-off-by: Krzysztof Kozlowski <krzk@xxxxxxxxxx>
    Link: https://lore.kernel.org/r/20200901075417.22481-8-krzk@xxxxxxxxxx
    Stable-dep-of: 33e2c595e2e4 ("ARM: dts: exynos: correct TMU phandle in Exynos5250")
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index fc966c10cf498..624fa234e7175 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -1104,26 +1104,6 @@ sysmmu_tv: sysmmu@14650000 {
 		};
 	};
 
-	thermal-zones {
-		cpu_thermal: cpu-thermal {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&tmu 0>;
-
-			cooling-maps {
-				map0 {
-				     /* Corresponds to 800MHz at freq_table */
-				     cooling-device = <&cpu0 9 9>, <&cpu1 9 9>;
-				};
-				map1 {
-				     /* Corresponds to 200MHz at freq_table */
-				     cooling-device = <&cpu0 15 15>,
-						      <&cpu1 15 15>;
-			       };
-		       };
-		};
-	};
-
 	timer {
 		compatible = "arm,armv7-timer";
 		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
@@ -1139,6 +1119,24 @@ timer {
 	};
 };
 
+&cpu_thermal {
+	polling-delay-passive = <0>;
+	polling-delay = <0>;
+	thermal-sensors = <&tmu 0>;
+
+	cooling-maps {
+		map0 {
+			/* Corresponds to 800MHz at freq_table */
+			cooling-device = <&cpu0 9 9>, <&cpu1 9 9>;
+		};
+		map1 {
+			/* Corresponds to 200MHz at freq_table */
+			cooling-device = <&cpu0 15 15>,
+					 <&cpu1 15 15>;
+		};
+	};
+};
+
 &dp {
 	power-domains = <&pd_disp1>;
 	clocks = <&clock CLK_DP>;