Merge "ARM: dts: msm: Add trusted touch entries on yupik qrd"

This commit is contained in:
qctecmdr 2021-03-23 18:51:22 -07:00 • committed by Gerrit - the friendly Code Review server
commit 4e09dea204
4 changed files with 44 additions and 10 deletions

View file

@ -605,6 +605,11 @@
pinctrl-0 = <&ts_active>;
pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
pinctrl-2 = <&ts_release>;
focaltech,trusted-touch-mode = "vm_mode";
focaltech,touch-environment = "pvm";
focaltech,trusted-touch-spi-irq = <601>;
focaltech,trusted-touch-io-bases = <0xf134000 0xf135000 0xf136000 0xf137000 0xf169000 0xf151000 0xa94000 0x00a10000>;
focaltech,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000 0x1000 0x1000 0x1000 0x4000>;
panel = <&dsi_r66451_amoled_144hz_cmd_cphy &dsi_r66451_amoled_120hz_cmd_cphy
&dsi_r66451_amoled_90hz_cmd_cphy &dsi_r66451_amoled_60hz_cmd_cphy>;
};

View file

@ -1,2 +1,19 @@
&soc {
};
&qupv3_se13_i2c {
status = "ok"
novatek@62 {
compatible = "novatek,NVT-ts";
reg = <0x62>;
novatek,trusted-touch-mode = "vm_mode";
novatek,touch-environment = "tvm";
novatek,trusted-touch-spi-irq = <601>;
novatek,trusted-touch-io-bases = <0xf134000 0xf135000 0xf169000 0xf151000 0xa94000 0x00a10000>;
novatek,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000 0x1000 0x4000>;
};
};
&qupv3_se13_spi {
status = "disabled";
};

View file

@ -1,2 +1,23 @@
&soc {
};
&qupv3_se13_i2c {
status = "disabled";
};
&qupv3_se13_spi {
status = "ok"
focaltech@0 {
compatible = "focaltech,fts_ts";
reg = <0x0>;
spi-max-frequency = <6000000>;
focaltech,max-touch-number = <5>;
focaltech,display-coords = <0 0 1080 2340>;
focaltech,ic-type = <0x3658D488>;
focaltech,trusted-touch-mode = "vm_mode";
focaltech,touch-environment = "tvm";
focaltech,trusted-touch-spi-irq = <601>;
focaltech,trusted-touch-io-bases = <0xf134000 0xf135000 0xf136000 0xf137000 0xf169000 0xf151000 0xa94000 0x00a10000>;
focaltech,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000 0x1000 0x1000 0x1000 0x4000>;
};
};

View file

@ -281,16 +281,7 @@
dma-names = "tx", "rx";
qcom,wrapper-core = <&qupv3_1>;
qcom,le-vm;
status = "ok"
novatek@62 {
compatible = "novatek,NVT-ts";
reg = <0x62>;
novatek,trusted-touch-mode = "vm_mode";
novatek,touch-environment = "tvm";
novatek,trusted-touch-spi-irq = <601>;
novatek,trusted-touch-io-bases = <0xf134000 0xf135000 0xf169000 0xf151000 0xa94000 0x00a10000>;
novatek,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000 0x1000 0x4000>;
};
status = "disabled";
};
qupv3_se13_spi: spi@a94000 {