Merge "ARM: dts: msm: Include display panel for Trusted UI"

This commit is contained in:
qctecmdr 2020-09-14 00:22:42 -07:00 • committed by Gerrit - the friendly Code Review server
commit 61552f8b76
5 changed files with 50 additions and 14 deletions

View file

@ -210,7 +210,7 @@
focaltech,touch-environment = "pvm";
focaltech,trusted-touch-spi-irq = <566>;
focaltech,trusted-touch-io-bases = <0xF114000 0xF115000 0xF116000 0xF117000 0x990000 0x00910000>;
focaltech,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000 0x4000 0x4000>;
focaltech,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000 0x1000 0x4000>;
};
};

View file

@ -1 +1,18 @@
/*#include "display/lahaina-sde-display-cdp.dtsi"*/
&qupv3_se4_i2c {
status = "ok"
st_fts@49 {
compatible = "st,fts";
reg = <0x49>;
st,x-flip = <1>;
st,y-flip = <1>;
st,regulator_dvdd = "vdd";
st,regulator_avdd = "avdd";
st,trusted-touch-mode = "vm_mode";
st,touch-environment = "tvm";
st,trusted-touch-spi-irq = <566>;
st,trusted-touch-io-bases = <0xF114000 0xF115000 0xF116000 0xF117000 0x990000 0x00910000>;
st,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000 0x1000 0x4000>;
};
};

View file

@ -1 +1,18 @@
/*#include "display/lahaina-sde-display-mtp.dtsi"*/
&qupv3_se4_i2c {
status = "ok"
st_fts@49 {
compatible = "st,fts";
reg = <0x49>;
st,x-flip = <1>;
st,y-flip = <1>;
st,regulator_dvdd = "vdd";
st,regulator_avdd = "avdd";
st,trusted-touch-mode = "vm_mode";
st,touch-environment = "tvm";
st,trusted-touch-spi-irq = <566>;
st,trusted-touch-io-bases = <0xF114000 0xF115000 0xF116000 0xF117000 0x990000 0x00910000>;
st,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000 0x1000 0x4000>;
};
};

View file

@ -1 +1,14 @@
/*#include "display/lahaina-sde-display-qrd.dtsi"*/
&qupv3_se4_i2c {
status = "ok"
focaltech@38 {
compatible = "focaltech,fts_ts";
reg = <0x38>;
focaltech,trusted-touch-mode = "vm_mode";
focaltech,touch-environment = "tvm";
focaltech,trusted-touch-spi-irq = <566>;
focaltech,trusted-touch-io-bases = <0xF114000 0xF115000 0xF116000 0xF117000 0x990000 0x00910000>;
focaltech,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000 0x1000 0x4000>;
};
};

View file

@ -302,19 +302,6 @@
qcom,wrapper-core = <&qupv3_0>;
qcom,le-vm;
status = "ok"
st_fts@49 {
compatible = "st,fts";
reg = <0x49>;
st,x-flip = <1>;
st,y-flip = <1>;
st,regulator_dvdd = "vdd";
st,regulator_avdd = "avdd";
st,trusted-touch-mode = "vm_mode";
st,touch-environment = "tvm";
st,trusted-touch-spi-irq = <566>;
st,trusted-touch-io-bases = <0xF114000 0xF115000 0xF116000 0xF117000 0x990000 0x00910000>;
st,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000 0x1000 0x4000>;
};
};
qupv3_se4_spi: spi@990000 {
@ -347,3 +334,5 @@
#include "display/trustedvm-lahaina-sde-display.dtsi"
#include "display/dsi-panel-sw43404-amoled-dsc-wqhd-cmd.dtsi"
#include "display/dsi-panel-sw43404-amoled-dsc-wqhd-video.dtsi"
#include "display/dsi-panel-r66451-dsc-fhd-plus-cmd.dtsi"
#include "display/dsi-panel-r66451-dsc-fhd-plus-video.dtsi"