5a5ba24be5252ffd1cf3f6e1ae437e5f7d3f191bf6b7e0f221c7779e.patch

From 992acd464d8cc2d4f335ae660b1ee097f36a7b65 Mon Sep 17 00:00:00 2001
From: Hsin-Yi Wang <hsinyi@chromium.org>
Date: Fri, 3 Sep 2021 17:07:59 +0800
Subject: [PATCH] CHROMIUM: arm64: dts: mt8183: katsu: remove unused
 touchscreen

Katsu inherits from kakadu. Kakadu has hid-over-i2c touchscreen on 0x10,
while katsu is on 0x5d. Remove the touchscreen on 0x10 for katsu
otherwise the touchscreen will fail to be probed with error:

[    0.295735] mt8183-pinctrl 10005000.pinctrl: pin GPIO155 already requested by 0-0010; cannot claim for 0-005d
[    0.295744] mt8183-pinctrl 10005000.pinctrl: pin-155 (0-005d) status -22
[    0.295751] mt8183-pinctrl 10005000.pinctrl: could not request pin 155 (GPIO155) from group GPIO155  on device pinctrl_paris
[    0.295758] i2c_hid_of 0-005d: Error applying setting, reverse things back
[    0.295766] i2c_hid_of 0-0010: supply vdd not found, using dummy regulator
[    0.295797] i2c_hid_of: probe of 0-005d failed with error -22

BUG=b:198576796, b:197308172
TEST=verify touchscreen on katsu

Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
Change-Id: Iae991d4074b119fd4e67bd7aa709bc725b4efe94
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3141332
Commit-Queue: Kansho Nishida <kansho@chromium.org>
Reviewed-by: Kansho Nishida <kansho@chromium.org>
---
 arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.dts | 1 +
 arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu.dts       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.dts
index cf008ed828783a87b1dabf56b9364c4d7862c986..7214d8fdb78f4d816ef15ba8970ea3c5cb9c40cc 100644
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.dts
@@ -14,6 +14,7 @@ / {
 };
 
 &i2c0 {
+	/delete-node/touchscreen@10;
 	touchscreen1: touchscreen@5d {
 		compatible = "goodix,gt7375p";
 		reg = <0x5d>;
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu.dts
index 6e2889b79097b0d83ac0447c7878b55da43b6611..b50cc5a225beebaa69fb5e6670956c0721ebe3d2 100644
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu.dts
@@ -15,6 +15,7 @@ / {
 &i2c0 {
 	status = "okay";
 
+	/delete-node/touchscreen@10;
 	touchscreen1: touchscreen@5D {
 		compatible = "hid-over-i2c";
 		reg = <0x5D>;
-- 
2.43.0.429.g432eaa2c6b-goog