From 9501f4d3e7e4b60d3b8c51c7cbd0cc8fc602e8cd Mon Sep 17 00:00:00 2001 From: Niranjan Reddy Dumbala Date: Sat, 26 Oct 2024 05:26:10 -0700 Subject: [PATCH] Revert "ARM: dts: msm: Update touch tlmm for parrot vm" This reverts commit 88312a73da134d518e3e724f7315191a1b234c50. Reason for revert: release branch Change-Id: I305197f73c9cc7740760e800a02d6343896ed8ce Signed-off-by: Niranjan Reddy Dumbala --- qcom/parrot-pinctrl.dtsi | 3 +-- qcom/parrot-qrd.dtsi | 9 +-------- qcom/parrot-vm-qrd.dtsi | 22 ---------------------- qcom/parrot-vm.dtsi | 5 ++--- 4 files changed, 4 insertions(+), 35 deletions(-) diff --git a/qcom/parrot-pinctrl.dtsi b/qcom/parrot-pinctrl.dtsi index 7d9220df..b314a02f 100644 --- a/qcom/parrot-pinctrl.dtsi +++ b/qcom/parrot-pinctrl.dtsi @@ -1893,8 +1893,7 @@ tuivm { qcom,label = <0x08>; qcom,vmid = <45>; - tlmm-vm-gpio-list = <&tlmm 98 0 &tlmm 99 0 &tlmm 10 0 &tlmm 11 0 - &tlmm 12 0 &tlmm 13 0 &tlmm 64 0 &tlmm 65 0>; + tlmm-vm-gpio-list = <&tlmm 98 0 &tlmm 99 0>; }; }; }; diff --git a/qcom/parrot-qrd.dtsi b/qcom/parrot-qrd.dtsi index 16fe6774..62fe1c6a 100644 --- a/qcom/parrot-qrd.dtsi +++ b/qcom/parrot-qrd.dtsi @@ -156,13 +156,6 @@ goodix,touch-type = "primary"; goodix,qts_en; - qts,trusted-touch-mode = "vm_mode"; - qts,touch-environment = "pvm"; - qts,trusted-touch-type = "primary"; - qts,trusted-touch-spi-irq = <595>; - qts,trusted-touch-io-bases = <0xa8c000>; - qts,trusted-touch-io-sizes = <0x1000>; - qts,trusted-touch-vm-gpio-list = <&tlmm 10 0 &tlmm 11 0 &tlmm 12 0 - &tlmm 13 0 &tlmm 64 0 &tlmm 65 0x2008>; + qcom,touch-environment = "pvm"; }; }; diff --git a/qcom/parrot-vm-qrd.dtsi b/qcom/parrot-vm-qrd.dtsi index a6f2eb6a..1510613d 100644 --- a/qcom/parrot-vm-qrd.dtsi +++ b/qcom/parrot-vm-qrd.dtsi @@ -5,25 +5,3 @@ &soc { }; - -&qupv3_se9_spi { - status = "ok"; - goodix-berlin@0 { - compatible = "goodix,gt9916S"; - reg = <0>; - spi-max-frequency = <1000000>; - goodix,panel-max-x = <1080>; - goodix,panel-max-y = <2400>; - goodix,panel-max-w = <255>; - goodix,panel-max-p = <4096>; - goodix,touch-type = "primary"; - goodix,qts_en; - qts,trusted-touch-mode = "vm_mode"; - qts,touch-environment = "tvm"; - qts,trusted-touch-type = "primary"; - qts,trusted-touch-spi-irq = <595>; - qts,trusted-touch-io-bases = <0xa8c000>; - qts,trusted-touch-io-sizes = <0x1000>; - qts,trusted-touch-vm-gpio-list = <&tlmm 10 0 &tlmm 11 0 &tlmm 12 0 &tlmm 13 0 &tlmm 64 0 &tlmm 65 0x2008>; - }; -}; diff --git a/qcom/parrot-vm.dtsi b/qcom/parrot-vm.dtsi index 5374ca14..5ec070cb 100644 --- a/qcom/parrot-vm.dtsi +++ b/qcom/parrot-vm.dtsi @@ -55,12 +55,11 @@ tlmm: pinctrl@f000000 { compatible = "qcom,parrot-vm-tlmm"; - gpios = /bits/ 16 <98 99 10 11 12 13 64 65>; + gpios = /bits/ 16 <98 99>; }; tlmm-vm-mem-access { - tlmm-vm-gpio-list = <&tlmm 98 0 &tlmm 99 0 &tlmm 10 0 &tlmm 11 0 - &tlmm 12 0 &tlmm 13 0 &tlmm 64 0 &tlmm 65 0>; + tlmm-vm-gpio-list = <&tlmm 98 0 &tlmm 99 0>; }; apps-smmu@15000000 {