Merge "ARM: dts: msm: support for secondary touch for CDP"

This commit is contained in:
qctecmdr
2024-04-19 05:08:13 -07:00
committed by Gerrit - the friendly Code Review server
2 changed files with 49 additions and 7 deletions

View File

@@ -251,10 +251,10 @@
#size-cells = <0>; #size-cells = <0>;
status = "ok"; status = "ok";
qcom,touch-active = "st,fts"; qcom,touch-active = "st,fts2";
st_fts@49 { st_fts@49 {
compatible = "st,fts"; compatible = "st,fts2";
reg = <0x49>; reg = <0x49>;
interrupt-parent = <&tlmm>; interrupt-parent = <&tlmm>;
interrupts = <88 0x2008>; interrupts = <88 0x2008>;
@@ -264,7 +264,7 @@
pinctrl-0 = <&ts_active>; pinctrl-0 = <&ts_active>;
pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>; pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
st,irq-gpio = <&tlmm 88 0x2008>; st,irq-gpio = <&tlmm 88 0x2008>;
st,reset-gpio = <&tlmm 91 0x00>; st,reset-gpio = <&tlmm 100 0x00>;
st,regulator_dvdd = "vdd"; st,regulator_dvdd = "vdd";
st,regulator_avdd = "avdd"; st,regulator_avdd = "avdd";
@@ -274,10 +274,10 @@
qts,touch-environment = "pvm"; qts,touch-environment = "pvm";
qts,trusted-touch-type = "secondary"; qts,trusted-touch-type = "secondary";
qts,trusted-touch-spi-irq = <670>; qts,trusted-touch-spi-irq = <670>;
qts,trusted-touch-io-bases = <0xa90000>; qts,trusted-touch-io-bases = <0x89c000>;
qts,trusted-touch-io-sizes = <0x1000>; qts,trusted-touch-io-sizes = <0x1000>;
qts,trusted-touch-vm-gpio-list = <&tlmm 60 0 &tlmm 61 0 &tlmm 62 0 qts,trusted-touch-vm-gpio-list = <&tlmm 28 0 &tlmm 29 0 &tlmm 30 0
&tlmm 63 0 &tlmm 91 0 &tlmm 88 0x2008>; &tlmm 31 0 &tlmm 100 0 &tlmm 88 0x2008>;
}; };
}; };

View File

@@ -1,6 +1,48 @@
// SPDX-License-Identifier: BSD-3-Clause // SPDX-License-Identifier: BSD-3-Clause
/* /*
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/ */
&soc { &soc {
}; };
&qupv3_se4_i2c {
status = "ok";
qcom,touch-active = "st,fts";
st_fts@49 {
compatible = "st,fts";
reg = <0x49>;
st,touch-type = "primary";
st,qts_en;
qts,trusted-touch-mode = "vm_mode";
qts,touch-environment = "pvm";
qts,trusted-touch-type = "primary";
qts,trusted-touch-spi-irq = <652>;
qts,trusted-touch-io-bases = <0xa90000>;
qts,trusted-touch-io-sizes = <0x1000>;
qts,trusted-touch-vm-gpio-list = <&tlmm 48 0 &tlmm 49 0 &tlmm 50 0
&tlmm 51 0 &tlmm 161 0 &tlmm 162 0x2008>;
};
};
&qupv3_se15_i2c {
status = "ok";
qcom,touch-active = "st,fts2";
st_fts@49 {
compatible = "st,fts2";
reg = <0x49>;
st,touch-type = "secondary";
st,qts_en;
qts,trusted-touch-mode = "vm_mode";
qts,touch-environment = "pvm";
qts,trusted-touch-type = "secondary";
qts,trusted-touch-spi-irq = <670>;
qts,trusted-touch-io-bases = <0x89c000>;
qts,trusted-touch-io-sizes = <0x1000>;
qts,trusted-touch-vm-gpio-list = <&tlmm 28 0 &tlmm 29 0 &tlmm 30 0
&tlmm 31 0 &tlmm 100 0 &tlmm 88 0x2008>;
};
};