FAILED: patch "[PATCH] arm64: dts: qcom: sc8280xp-x13s: fix touchscreen power on" failed to apply to 6.1-stable tree

[<gregkh@linuxfoundation.org>]

The patch below does not apply to the 6.1-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-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 7bfb6a4289b0a63d67ec7d4ce3018cb4a7442f6a
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2024071521-python-duller-bb70@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..

Possible dependencies:

7bfb6a4289b0 ("arm64: dts: qcom: sc8280xp-x13s: fix touchscreen power on")
b01899cb1865 ("arm64: dts: qcom: sc8280xp-x13s: add hid 1.8V supplies")
31e62e862a1e ("arm64: dts: qcom: sc8280xp: rename qup0_i2c4 to i2c4")
6e1569ddfa64 ("arm64: dts: qcom: sc8280xp: rename qup2_i2c5 to i2c21")
71bc1b42844f ("arm64: dts: qcom: sc8280xp: rename qup2_uart17 to uart17")
f48c70b111b4 ("arm64: dts: qcom: sc8280xp-x13s: enable eDP display")
4a883a8d80b5 ("arm64: dts: qcom: sc8280xp-crd: Enable EDP")
e1deaa8437c4 ("arm64: dts: qcom: sa8295p-adp: use sa8540p-pmics")
2eb4cdcd5aba ("arm64: dts: qcom: sa8540p-ride: enable pcie2a node")
f29077d86652 ("arm64: dts: qcom: sc8280xp-x13s: Add soundcard support")
b8bf63f8eb72 ("arm64: dts: qcom: sa8540p-ride: enable PCIe support")
6be310347c9c ("arm64: dts: qcom: add SA8540P ride(Qdrive-3)")
30d70ec8f7fd ("arm64: dts: qcom: sa8295p-adp: Add RTC node")
123b30a75623 ("arm64: dts: qcom: sc8280xp-x13s: enable WiFi controller")
176d54acd5d9 ("arm64: dts: qcom: sc8280xp-x13s: enable modem")
b4bb952e6cfc ("arm64: dts: qcom: sc8280xp-x13s: enable NVMe SSD")
d907fe5acbf1 ("arm64: dts: qcom: sc8280xp-crd: enable WiFi controller")
17e2ccaf65d1 ("arm64: dts: qcom: sc8280xp-crd: enable SDX55 modem")
6a1ec5eca73c ("arm64: dts: qcom: sc8280xp-crd: enable NVMe SSD")
a607fe5ea213 ("arm64: dts: qcom: sc8280xp-x13s: Add LID switch")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 7bfb6a4289b0a63d67ec7d4ce3018cb4a7442f6a Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan+linaro@kernel.org>
Date: Tue, 7 May 2024 16:48:19 +0200
Subject: [PATCH] arm64: dts: qcom: sc8280xp-x13s: fix touchscreen power on

The Elan eKTH5015M touch controller on the X13s requires a 300 ms delay
before sending commands after having deasserted reset during power on.

Switch to the Elan specific binding so that the OS can determine the
required power-on sequence and make sure that the controller is always
detected during boot.

Note that the always-on 1.8 V supply (s10b) is not used by the
controller directly and should not be described.

Fixes: 32c231385ed4 ("arm64: dts: qcom: sc8280xp: add Lenovo Thinkpad X13s devicetree")
Cc: stable@vger.kernel.org	# 6.0
Tested-by: Steev Klimaszewski <steev@kali.org>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20240507144821.12275-6-johan+linaro@kernel.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
index e937732abede..4bf99b6b6e5f 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
@@ -655,15 +655,16 @@ &i2c4 {
 
 	status = "okay";
 
-	/* FIXME: verify */
 	touchscreen@10 {
-		compatible = "hid-over-i2c";
+		compatible = "elan,ekth5015m", "elan,ekth6915";
 		reg = <0x10>;
 
-		hid-descr-addr = <0x1>;
 		interrupts-extended = <&tlmm 175 IRQ_TYPE_LEVEL_LOW>;
-		vdd-supply = <&vreg_misc_3p3>;
-		vddl-supply = <&vreg_s10b>;
+		reset-gpios = <&tlmm 99 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>;
+		no-reset-on-power-off;
+
+		vcc33-supply = <&vreg_misc_3p3>;
+		vccio-supply = <&vreg_misc_3p3>;
 
 		pinctrl-names = "default";
 		pinctrl-0 = <&ts0_default>;
@@ -1496,8 +1497,8 @@ int-n-pins {
 		reset-n-pins {
 			pins = "gpio99";
 			function = "gpio";
-			output-high;
-			drive-strength = <16>;
+			drive-strength = <2>;
+			bias-disable;
 		};
 	};