Merge "Revert "ARM: dts: msm: Update touch tlmm for parrot vm"" into kernel.lnx.6.6.r1-rel

This commit is contained in:
Linux Build Service Account
2024-10-26 05:27:17 -07:00
committed by Gerrit - the friendly Code Review server
4 changed files with 4 additions and 35 deletions

View File

@@ -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>;
};
};
};

View File

@@ -159,13 +159,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";
};
};

View File

@@ -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>;
};
};

View File

@@ -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 {