From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4340BC678D4 for ; Tue, 7 Mar 2023 09:43:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230077AbjCGJnT (ORCPT ); Tue, 7 Mar 2023 04:43:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230042AbjCGJnR (ORCPT ); Tue, 7 Mar 2023 04:43:17 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00F9B234CD for ; Tue, 7 Mar 2023 01:43:13 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id A4638B816A1 for ; Tue, 7 Mar 2023 09:43:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17AEAC433EF; Tue, 7 Mar 2023 09:43:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678182191; bh=umjBUdLV3n6MpOp7DSva+Fe7AJiiyOixKN4Pg9sDea4=; h=Subject:To:Cc:From:Date:From; b=Bqny9lHeLn1No8/QUuXBkDzCtR8wMYGRjlxHMr2K4Ee6U6uP3h/dIGN4OVBUYRtBq K+ohmKUlxRq11O+zddZv6qDOrg3regPeijM+roRIag1cGbAbhJK85HFc+WjICPSurI 7su3bxtjuCv9IDWXmkUfGOiN/9waTG307WueAAc0= Subject: FAILED: patch "[PATCH] ARM: dts: exynos: correct TMU phandle in Odroid XU3 family" failed to apply to 4.14-stable tree To: krzysztof.kozlowski@linaro.org, stable@vger.kernel.org Cc: From: Date: Tue, 07 Mar 2023 10:42:58 +0100 Message-ID: <167818217898188@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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 . 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 a3583e92d188ec6c58c7f603ac5e72dd8a11c21a # git commit -s git send-email --to '' --in-reply-to '167818217898188@kroah.com' --subject-prefix 'PATCH 4.14.y' HEAD^.. Possible dependencies: a3583e92d188 ("ARM: dts: exynos: correct TMU phandle in Odroid XU3 family") 1c651356f482 ("ARM: dts: exynos: Add GPU thermal zone cooling maps for Odroid XU3/XU4/HC1") 1ac49427b566 ("ARM: dts: exynos: Add support for Hardkernel's Odroid HC1 board") a798f2f02f4c ("ARM: dts: exynos: Move audio clocks configuration to odroidxu3-audio.dtsi") 227c23b5dee1 ("ARM: dts: exynos: Add power button for Odroid XU3/4") e740731dae94 ("ARM: dts: exynos: fix incomplete Odroid-XU3/4 thermal-zones definition") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From a3583e92d188ec6c58c7f603ac5e72dd8a11c21a Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski Date: Thu, 9 Feb 2023 11:58:41 +0100 Subject: [PATCH] ARM: dts: exynos: correct TMU phandle in Odroid XU3 family TMU node uses 0 as thermal-sensor-cells, thus thermal zone referencing it must not have an argument to phandle. This was not critical before, but since rework of thermal Devicetree initialization in the commit 3fd6d6e2b4e8 ("thermal/of: Rework the thermal device tree initialization"), this leads to errors registering thermal zones other than first one: thermal_sys: cpu0-thermal: Failed to read thermal-sensors cells: -2 thermal_sys: Failed to find thermal zone for tmu id=0 exynos-tmu 10064000.tmu: Failed to register sensor: -2 exynos-tmu: probe of 10064000.tmu failed with error -2 Fixes: f1722d7dd8b8 ("ARM: dts: Define default thermal-zones for exynos5422") Cc: Link: https://lore.kernel.org/r/20230209105841.779596-6-krzysztof.kozlowski@linaro.org Signed-off-by: Krzysztof Kozlowski diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi index a6961ff24030..e6e7e2ff2a26 100644 --- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi +++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi @@ -50,7 +50,7 @@ thermal-zones { cpu0_thermal: cpu0-thermal { - thermal-sensors = <&tmu_cpu0 0>; + thermal-sensors = <&tmu_cpu0>; polling-delay-passive = <250>; polling-delay = <0>; trips { @@ -139,7 +139,7 @@ }; }; cpu1_thermal: cpu1-thermal { - thermal-sensors = <&tmu_cpu1 0>; + thermal-sensors = <&tmu_cpu1>; polling-delay-passive = <250>; polling-delay = <0>; trips { @@ -212,7 +212,7 @@ }; }; cpu2_thermal: cpu2-thermal { - thermal-sensors = <&tmu_cpu2 0>; + thermal-sensors = <&tmu_cpu2>; polling-delay-passive = <250>; polling-delay = <0>; trips { @@ -285,7 +285,7 @@ }; }; cpu3_thermal: cpu3-thermal { - thermal-sensors = <&tmu_cpu3 0>; + thermal-sensors = <&tmu_cpu3>; polling-delay-passive = <250>; polling-delay = <0>; trips { @@ -358,7 +358,7 @@ }; }; gpu_thermal: gpu-thermal { - thermal-sensors = <&tmu_gpu 0>; + thermal-sensors = <&tmu_gpu>; polling-delay-passive = <250>; polling-delay = <0>; trips {