The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.14.y git checkout FETCH_HEAD git cherry-pick -x 33e2c595e2e4016991ead44933a29d1ef93d5f26 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to 'stable@vger.kernel.org' --in-reply-to '16781821949666@kroah.com' --subject-prefix 'PATCH 4.14.y' HEAD^..
Possible dependencies:
33e2c595e2e4 ("ARM: dts: exynos: correct TMU phandle in Exynos5250") 7e86ef5cc896 ("ARM: dts: exynos: Override thermal by label in Exynos5250") be00300147ae ("ARM: dts: exynos: Move pmu and timer nodes out of soc") 670734f55810 ("ARM: dts: exynos: Add all CPUs in cooling maps") eb9e16d8573e ("ARM: dts: exynos: Convert exynos5250.dtsi to opp-v2 bindings") 672f33198bee ("arm: dts: exynos: Add missing cooling device properties for CPUs") c769eaf7a85d ("ARM: dts: exynos: Split Trats2 DTS in preparation for Midas boards") cd6f55457eb4 ("ARM: dts: exynos: Remove "cooling-{min|max}-level" for CPU nodes") 73a901d09a21 ("ARM: dts: exynos: Add soc node to exynos4") 9097b4bd9fce ("ARM: dts: exynos: Use pmu label in exynos4412") 8ce5c46d0230 ("ARM: dts: exynos: Use labels instead of full paths in exynos4412-trats2") e030be47ac48 ("ARM: dts: exynos: Use labels instead of full paths in exynos4210") e58864515240 ("ARM: dts: exynos: Use pinctrl labels in exynos4412-pinctrl") 88c166cec136 ("ARM: dts: exynos: Use pinctrl labels in exynos4210-pinctrl") 3be1ecf291df ("ARM: dts: exynos: Use lower case hex addresses in node unit addresses") 6351fe9375f4 ("ARM: dts: exynos: Add G3D power domain to Exynos5250") c0d40bb3ac71 ("ARM: dts: exynos: Add audio power domain to Exynos5250") 9fbb4c096323 ("ARM: dts: exynos: Fix power domain node names for Exynos5250") 528832d4c01a ("ARM: dts: exynos: Add audio power domain support to Exynos542x SoCs") cdd745c8c76b ("ARM: dts: exynos: Remove duplicate definitions of SSS nodes for Exynos5")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 33e2c595e2e4016991ead44933a29d1ef93d5f26 Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski krzysztof.kozlowski@linaro.org Date: Thu, 9 Feb 2023 11:58:38 +0100 Subject: [PATCH] ARM: dts: exynos: correct TMU phandle in Exynos5250
TMU node uses 0 as thermal-sensor-cells, thus thermal zone referencing it must not have an argument to phandle.
Cc: stable@vger.kernel.org Fixes: 9843a2236003 ("ARM: dts: Provide dt bindings identical for Exynos TMU") Link: https://lore.kernel.org/r/20230209105841.779596-3-krzysztof.kozlowski@linaro... Signed-off-by: Krzysztof Kozlowski krzysztof.kozlowski@linaro.org
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 4708dcd575a7..01751706ff96 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -1107,7 +1107,7 @@ &cpu_thermal { polling-delay-passive = <0>; polling-delay = <0>; - thermal-sensors = <&tmu 0>; + thermal-sensors = <&tmu>;
cooling-maps { map0 {