Merge "ARM: dts: msm: Add touch support for shima target"

This commit is contained in:
qctecmdr 2020-08-12 01:56:14 -07:00 • committed by Gerrit - the friendly Code Review server
commit e683db8c4a
3 changed files with 92 additions and 0 deletions

View file

@ -1,6 +1,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include "shima-pmic-overlay.dtsi"
#include "display/shima-sde-display-idp.dtsi"
&soc {
gpio_keys {
@ -129,4 +130,34 @@
qcom,thermal-mitigation = <3000000 1500000 1000000 500000>;
};
&qupv3_se10_i2c {
#address-cells = <1>;
#size-cells = <0>;
status = "ok"
qcom,i2c-touch-active = "focaltech,fts_ts";
focaltech@38 {
compatible = "focaltech,fts_ts";
reg = <0x38>;
interrupt-parent = <&tlmm>;
interrupts = <23 0x2008>;
focaltech,reset-gpio = <&tlmm 22 0x00>;
focaltech,irq-gpio = <&tlmm 23 0x2008>;
focaltech,max-touch-number = <5>;
focaltech,display-coords = <0 0 1080 2340>;
vdd-supply = <&L3C>;
vcc_i2c-supply = <&L8C>;
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>;
panel = <&dsi_r66451_amoled_cmd
&dsi_r66451_amoled_video>;
};
};
#include "camera/shima-camera-sensor-idp.dtsi"

View file

@ -2917,6 +2917,66 @@
};
};
pmx_ts_active {
ts_active: ts_active {
mux {
pins = "gpio22", "gpio23";
function = "gpio";
};
config {
pins = "gpio22", "gpio23";
drive-strength = <8>;
bias-pull-up;
};
};
};
pmx_ts_reset_suspend {
ts_reset_suspend: ts_reset_suspend {
mux {
pins = "gpio22";
function = "gpio";
};
config {
pins = "gpio22";
drive-strength = <2>;
bias-pull-down;
};
};
};
pmx_ts_int_suspend {
ts_int_suspend: ts_int_suspend {
mux {
pins = "gpio23";
function = "gpio";
};
config {
pins = "gpio23";
drive-strength = <2>;
bias-pull-down;
};
};
};
pmx_ts_release {
ts_release: ts_release {
mux {
pins = "gpio22", "gpio23";
function = "gpio";
};
config {
pins = "gpio22", "gpio23";
drive-strength = <2>;
bias-disable;
};
};
};
cnss_pins {
cnss_wlan_en_active: cnss_wlan_en_active {
mux {

View file

@ -2781,6 +2781,7 @@
#include "shima-cvp.dtsi"
#include "shima-thermal.dtsi"
#include "shima-gpu.dtsi"
#include "display/shima-sde.dtsi"
#include "shima-audio.dtsi"
&pcie0_rp {