diff --git a/qcom/ravelin-idp.dtsi b/qcom/ravelin-idp.dtsi index 0c8d1e32..458213b8 100644 --- a/qcom/ravelin-idp.dtsi +++ b/qcom/ravelin-idp.dtsi @@ -72,19 +72,20 @@ focaltech,max-touch-number = <10>; focaltech,ic-type = <0x8726081C>; focaltech,touch-type = "primary"; + focaltech,qts_en; pinctrl-names = "pmx_ts_active","pmx_ts_suspend","pmx_ts_release"; 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-type = "primary"; - focaltech,trusted-touch-spi-irq = <566>; - focaltech,trusted-touch-io-bases = <0x984000 0x910000>; - focaltech,trusted-touch-io-sizes = <0x1000 0x4000>; - focaltech,trusted-touch-vm-gpio-list = <&tlmm 10 0 &tlmm 11 0 + qts,trusted-touch-mode = "vm_mode"; + qts,touch-environment = "pvm"; + qts,trusted-touch-type = "primary"; + qts,trusted-touch-spi-irq = <566>; + qts,trusted-touch-io-bases = <0x984000 0x910000>; + qts,trusted-touch-io-sizes = <0x1000 0x4000>; + qts,trusted-touch-vm-gpio-list = <&tlmm 10 0 &tlmm 11 0 &tlmm 12 0 &tlmm 13 0x2008>; }; }; diff --git a/qcom/ravelin-pinctrl.dtsi b/qcom/ravelin-pinctrl.dtsi index c999ebb9..e0aed3ad 100644 --- a/qcom/ravelin-pinctrl.dtsi +++ b/qcom/ravelin-pinctrl.dtsi @@ -1407,7 +1407,7 @@ tuivm { qcom,label = <0x08>; qcom,vmid = <45>; - tlmm-vm-gpio-list = <&tlmm 92 0 &tlmm 93 0>; + tlmm-vm-gpio-list = <&tlmm 92 0 &tlmm 93 0 &tlmm 10 0 &tlmm 11 0 &tlmm 12 0 &tlmm 13 0x2008>; }; }; }; diff --git a/qcom/ravelin-vm-idp.dtsi b/qcom/ravelin-vm-idp.dtsi index fd0e6de3..99f4df4d 100644 --- a/qcom/ravelin-vm-idp.dtsi +++ b/qcom/ravelin-vm-idp.dtsi @@ -9,6 +9,7 @@ &qupv3_se1_i2c { status = "ok"; focaltech@38 { + compatible = "focaltech,fts_ts"; reg = <0x38>; focaltech,display-coords = <0 0 1080 2408>; focaltech,max-touch-number = <5>; @@ -16,13 +17,15 @@ focaltech,reset-gpio-base = <0xF10C000>; focaltech,intr-gpio-base = <0xF10D000>; - focaltech,trusted-touch-mode = "vm_mode"; - focaltech,touch-environment = "tvm"; - focaltech,trusted-touch-type = "primary"; - focaltech,trusted-touch-spi-irq = <566>; - focaltech,trusted-touch-io-bases = <0x984000 0x910000>; - focaltech,trusted-touch-io-sizes = <0x1000 0x4000>; - focaltech,trusted-touch-vm-gpio-list = <&tlmm 10 0 &tlmm 11 0 + focaltech,touch-type = "primary"; + focaltech,qts_en; + qts,trusted-touch-mode = "vm_mode"; + qts,touch-environment = "tvm"; + qts,trusted-touch-type = "primary"; + qts,trusted-touch-spi-irq = <566>; + qts,trusted-touch-io-bases = <0x984000 0x910000>; + qts,trusted-touch-io-sizes = <0x1000 0x4000>; + qts,trusted-touch-vm-gpio-list = <&tlmm 10 0 &tlmm 11 0 &tlmm 12 0 &tlmm 13 0x2008>; }; }; diff --git a/qcom/ravelin-vm.dtsi b/qcom/ravelin-vm.dtsi index 9fb48b09..abfbde71 100644 --- a/qcom/ravelin-vm.dtsi +++ b/qcom/ravelin-vm.dtsi @@ -45,11 +45,11 @@ tlmm: pinctrl@f000000 { compatible = "qcom,ravelin-vm-tlmm"; - gpios = /bits/ 16 <92 93>; + gpios = /bits/ 16 <92 93 10 11 12 13>; }; tlmm-vm-mem-access { - tlmm-vm-gpio-list = <&tlmm 92 0 &tlmm 93 0>; + tlmm-vm-gpio-list = <&tlmm 92 0 &tlmm 93 0 &tlmm 10 0 &tlmm 11 0 &tlmm 12 0 &tlmm 13 0x2008>; }; apps-smmu@15000000 {