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 9F07CEE020A for ; Wed, 13 Sep 2023 19:04:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230311AbjIMTEu (ORCPT ); Wed, 13 Sep 2023 15:04:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232197AbjIMTEu (ORCPT ); Wed, 13 Sep 2023 15:04:50 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B46019A0 for ; Wed, 13 Sep 2023 12:04:46 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 77EE8C433C8; Wed, 13 Sep 2023 19:04:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1694631885; bh=/Q1WUdOWOXRFGvtGNymynipWYxyqJZxS/cCffrNA9mM=; h=Subject:To:Cc:From:Date:From; b=SyIeH6d2UtVhiLwaeI98FN1AnvSX0plt/8aJMdyAb0uZdhMoRP2SXnMPJ+OcA9pie LnGZFzF237+jadCCe+SVs73jxyNVJPEnLhGVW2u82EtGQb57WZBS5QRfcDfo97yhck AVxS/Gaag5wL1gRw8EbNgD4j4SeZAVQ/KUJN/ZkE= Subject: FAILED: patch "[PATCH] ARM: dts: qcom: msm8974pro-castor: correct touchscreen" failed to apply to 5.10-stable tree To: krzysztof.kozlowski@linaro.org, andersson@kernel.org, stable@vger.kernel.org Cc: From: Date: Wed, 13 Sep 2023 21:04:30 +0200 Message-ID: <2023091330-blog-morbidly-92f3@gregkh> 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 5.10-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-5.10.y git checkout FETCH_HEAD git cherry-pick -x 7c74379afdfee7b13f1cd8ff1ad6e0f986aec96c # git commit -s git send-email --to '' --in-reply-to '2023091330-blog-morbidly-92f3@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: 7c74379afdfe ("ARM: dts: qcom: msm8974pro-castor: correct touchscreen syna,nosleep-mode") 724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories") 86684c2481b6 ("ARM: dts: Add .dts files missing from the build") 313c22bb3195 ("Merge tag 'arm-soc/for-6.5/devicetree' of https://github.com/Broadcom/stblinux into soc/dt") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 7c74379afdfee7b13f1cd8ff1ad6e0f986aec96c Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski Date: Thu, 20 Jul 2023 13:53:35 +0200 Subject: [PATCH] ARM: dts: qcom: msm8974pro-castor: correct touchscreen syna,nosleep-mode There is no syna,nosleep property in Synaptics RMI4 touchscreen: qcom-msm8974pro-sony-xperia-shinano-castor.dtb: synaptics@2c: rmi4-f01@1: 'syna,nosleep' does not match any of the regexes: 'pinctrl-[0-9]+' Fixes: ab80661883de ("ARM: dts: qcom: msm8974: Add Sony Xperia Z2 Tablet") Cc: Signed-off-by: Krzysztof Kozlowski Link: https://lore.kernel.org/r/20230720115335.137354-6-krzysztof.kozlowski@linaro.org Signed-off-by: Bjorn Andersson diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts index 726ed67415e1..11468d1409f7 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -127,7 +127,7 @@ synaptics@2c { rmi4-f01@1 { reg = <0x1>; - syna,nosleep = <1>; + syna,nosleep-mode = <1>; }; rmi4-f11@11 {