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 51C0CEE0202 for ; Wed, 13 Sep 2023 19:04:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232176AbjIMTER (ORCPT ); Wed, 13 Sep 2023 15:04:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232161AbjIMTEQ (ORCPT ); Wed, 13 Sep 2023 15:04:16 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08E23170F for ; Wed, 13 Sep 2023 12:04:13 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17BF5C433C8; Wed, 13 Sep 2023 19:04:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1694631852; bh=w7Mesu0qUsux757ok5J33FFrP0JgjnjdIRpQaWbu8Wk=; h=Subject:To:Cc:From:Date:From; b=QLcq2fmcLhLamEn1MN968htriPsknrqH8Z6uDAGsCZOKF8f1ta/dhbcJk/kgurgWx 5BTemuRb9uq+0WTMe782//1IDJ5JFeyDTYIrwAwmvI0/QhqKueNbIfRiVmsp1Q2RwP YPQyzux+CqnB2Nd4IVQ9iLJMb8vdQashFvkubOK0= Subject: FAILED: patch "[PATCH] ARM: dts: qcom: msm8974pro-castor: correct inverted X of" failed to apply to 4.19-stable tree To: krzysztof.kozlowski@linaro.org, andersson@kernel.org, stable@vger.kernel.org Cc: From: Date: Wed, 13 Sep 2023 21:03:56 +0200 Message-ID: <2023091356-suffering-trickily-50f2@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 4.19-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.19.y git checkout FETCH_HEAD git cherry-pick -x 43db69268149049540b1d2bbe8a69e59d5cb43b6 # git commit -s git send-email --to '' --in-reply-to '2023091356-suffering-trickily-50f2@gregkh' --subject-prefix 'PATCH 4.19.y' HEAD^.. Possible dependencies: 43db69268149 ("ARM: dts: qcom: msm8974pro-castor: correct inverted X of touchscreen") 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 43db69268149049540b1d2bbe8a69e59d5cb43b6 Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski Date: Thu, 20 Jul 2023 13:53:33 +0200 Subject: [PATCH] ARM: dts: qcom: msm8974pro-castor: correct inverted X of touchscreen There is no syna,f11-flip-x property, so assume intention was to use touchscreen-inverted-x. 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-4-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 154639d56f35..c41e25367bc9 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 @@ -132,8 +132,8 @@ rmi-f01@1 { rmi-f11@11 { reg = <0x11>; - syna,f11-flip-x = <1>; syna,sensor-type = <1>; + touchscreen-inverted-x; }; }; };