The patch below does not apply to the 5.4-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@xxxxxxxxxxxxxxx>. 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-5.4.y git checkout FETCH_HEAD git cherry-pick -x 408ab6786dbf6dd696488054c9559681112ef994 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '16781821519722@xxxxxxxxx' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: 408ab6786dbf ("ARM: dts: exynos: correct TMU phandle in Exynos4210") 1708f56081e2 ("ARM: dts: exynos: Override thermal by label in Exynos4210") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 408ab6786dbf6dd696488054c9559681112ef994 Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx> Date: Thu, 9 Feb 2023 11:58:37 +0100 Subject: [PATCH] ARM: dts: exynos: correct TMU phandle in Exynos4210 TMU node uses 0 as thermal-sensor-cells, thus thermal zone referencing it must not have an argument to phandle. Since thermal-sensors property is already defined in included exynos4-cpu-thermal.dtsi, drop it from exynos4210.dtsi to fix the error and remoev redundancy. Fixes: 9843a2236003 ("ARM: dts: Provide dt bindings identical for Exynos TMU") Cc: <stable@xxxxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20230209105841.779596-2-krzysztof.kozlowski@xxxxxxxxxx Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx> diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi index 2c25cc37934e..f8c6c5d1906a 100644 --- a/arch/arm/boot/dts/exynos4210.dtsi +++ b/arch/arm/boot/dts/exynos4210.dtsi @@ -393,7 +393,6 @@ &cpu_thermal { polling-delay-passive = <0>; polling-delay = <0>; - thermal-sensors = <&tmu 0>; }; &gic {
