Merge "ARM: dts: msm: use TLMM to reference trusted touch GPIOs on Waipio"

This commit is contained in:
qctecmdr
2021-09-01 18:49:40 -07:00
committed by Gerrit - the friendly Code Review server
8 changed files with 32 additions and 23 deletions

View File

@@ -146,10 +146,10 @@
focaltech,touch-environment = "pvm";
focaltech,trusted-touch-type = "primary";
focaltech,trusted-touch-spi-irq = <754>;
focaltech,trusted-touch-io-bases = <0xF110000 0xF111000 0xF112000 0xF113000
0xF114000 0xF115000 0x990000 0x00910000>;
focaltech,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000
0x1000 0x1000 0x1000 0x4000>;
focaltech,trusted-touch-io-bases = <0x990000 0x910000>;
focaltech,trusted-touch-io-sizes = <0x1000 0x4000>;
focaltech,trusted-touch-vm-gpio-list = <&tlmm 16 0 &tlmm 17 0 &tlmm 18 0
&tlmm 19 0 &tlmm 20 0 &tlmm 21 0x2008>;
};
atmel_mxt_ts@4a {

View File

@@ -151,10 +151,10 @@
focaltech,touch-environment = "pvm";
focaltech,trusted-touch-type = "primary";
focaltech,trusted-touch-spi-irq = <754>;
focaltech,trusted-touch-io-bases = <0xF110000 0xF111000 0xF112000 0xF113000
0xF114000 0xF115000 0x990000 0x00910000>;
focaltech,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000
0x1000 0x1000 0x1000 0x4000>;
focaltech,trusted-touch-io-bases = <0x990000 0x910000>;
focaltech,trusted-touch-io-sizes = <0x1000 0x4000>;
focaltech,trusted-touch-vm-gpio-list = <&tlmm 16 0 &tlmm 17 0 &tlmm 18 0
&tlmm 19 0 &tlmm 20 0 &tlmm 21 0x2008>;
};
};

View File

@@ -171,6 +171,9 @@
&qupv3_se4_spi {
status = "ok";
#address-cells = <1>;
#size-cells = <0>;
qcom,spi-touch-active = "focaltech,fts_ts";
qcom,la-vm;
@@ -198,8 +201,10 @@
focaltech,touch-environment = "pvm";
focaltech,trusted-touch-type = "primary";
focaltech,trusted-touch-spi-irq = <754>;
focaltech,trusted-touch-io-bases = <0xF110000 0xF111000 0xF112000 0xF113000 0xF114000 0xF115000 0x990000 0x00910000>;
focaltech,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000 0x1000 0x1000 0x1000 0x4000>;
focaltech,trusted-touch-io-bases = <0x990000 0x910000>;
focaltech,trusted-touch-io-sizes = <0x1000 0x4000>;
focaltech,trusted-touch-vm-gpio-list = <&tlmm 16 0 &tlmm 17 0 &tlmm 18 0
&tlmm 19 0 &tlmm 20 0 &tlmm 21 0x2008>;
};
};

View File

@@ -4,13 +4,14 @@
compatible = "focaltech,fts_ts";
reg = <0x38>;
focaltech,display-coords = <0 0 1080 2340>;
focaltech,max-touch-number = <5>;
focaltech,trusted-touch-mode = "vm_mode";
focaltech,trusted-touch-type = "primary";
focaltech,touch-environment = "tvm";
focaltech,trusted-touch-spi-irq = <754>;
focaltech,trusted-touch-io-bases = <0xF110000 0xF111000 0xF112000 0xF113000
0xF114000 0xF115000 0x990000 0x00910000>;
focaltech,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000
0x1000 0x1000 0x1000 0x4000>;
focaltech,trusted-touch-io-bases = <0x990000 0x910000>;
focaltech,trusted-touch-io-sizes = <0x1000 0x4000>;
focaltech,trusted-touch-vm-gpio-list = <&tlmm 16 0 &tlmm 17 0 &tlmm 18 0
&tlmm 19 0 &tlmm 20 0 &tlmm 21 0x2008>;
};
};

View File

@@ -5,13 +5,14 @@
compatible = "focaltech,fts_ts";
reg = <0x38>;
focaltech,display-coords = <0 0 1080 2340>;
focaltech,max-touch-number = <5>;
focaltech,trusted-touch-mode = "vm_mode";
focaltech,touch-environment = "tvm";
focaltech,trusted-touch-type = "primary";
focaltech,trusted-touch-spi-irq = <754>;
focaltech,trusted-touch-io-bases = <0xF110000 0xF111000 0xF112000 0xF113000
0xF114000 0xF115000 0x990000 0x00910000>;
focaltech,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000
0x1000 0x1000 0x1000 0x4000>;
focaltech,trusted-touch-io-bases = <0x990000 0x910000>;
focaltech,trusted-touch-io-sizes = <0x1000 0x4000>;
focaltech,trusted-touch-vm-gpio-list = <&tlmm 16 0 &tlmm 17 0 &tlmm 18 0
&tlmm 19 0 &tlmm 20 0 &tlmm 21 0x2008>;
};
};

View File

@@ -21,7 +21,9 @@
focaltech,touch-environment = "tvm";
focaltech,trusted-touch-type = "primary";
focaltech,trusted-touch-spi-irq = <754>;
focaltech,trusted-touch-io-bases = <0xF110000 0xF111000 0xF112000 0xF113000 0xF114000 0xF115000 0x990000 0x00910000>;
focaltech,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000 0x1000 0x1000 0x1000 0x4000>;
focaltech,trusted-touch-io-bases = <0x990000 0x910000>;
focaltech,trusted-touch-io-sizes = <0x1000 0x4000>;
focaltech,trusted-touch-vm-gpio-list = <&tlmm 16 0 &tlmm 17 0 &tlmm 18 0
&tlmm 19 0 &tlmm 20 0 &tlmm 21 0x2008>;
};
};

View File

@@ -259,7 +259,7 @@
interrupt-controller;
#interrupt-cells = <2>;
/* Valid pins */
gpios = /bits/ 16 <64 65 66 67 0 4 86 87>;
gpios = /bits/ 16 <64 65 66 67 0 4 86 87 16 17 18 19 20 21>;
};
psci {
@@ -269,7 +269,7 @@
tlmm-vm-mem-access {
compatible = "qcom,tlmm-vm-mem-access";
tlmm-vm-gpio-list = <365 366 367 368 301 305 387 388>;
tlmm-vm-gpio-list = <365 366 367 368 301 305 387 388 317 318 319 320 321 322>;
};
vgic: interrupt-controller@17100000 {

View File

@@ -1237,7 +1237,7 @@
tlmm-vm-mem-access {
compatible = "qcom,tlmm-vm-mem-access";
qcom,master;
tlmm-vm-gpio-list = <365 366 367 368 301 305 387 388>;
tlmm-vm-gpio-list = <365 366 367 368 301 305 387 388 317 318 319 320 321 322>;
};
qcom,gh_vm_loader_sec@e0b00000 {