mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-10 06:09:23 -04:00
Merge "ARM: dts: msm: include touch nodes for rm69299 panel on Holi target"
This commit is contained in:
commit
99efeecfac
5 changed files with 117 additions and 12 deletions
|
|
@ -8,10 +8,10 @@
|
|||
reg = <0x22>;
|
||||
interrupt-parent = <&tlmm>;
|
||||
interrupts = <39 0x2008>;
|
||||
vdd-supply = <&L11A>;
|
||||
avdd-supply = <&L6A>;
|
||||
vdd-supply = <&L9A>;
|
||||
avdd-supply = <&touch_avdd>;
|
||||
pinctrl-names = "pmx_ts_active", "pmx_ts_suspend",
|
||||
"pmx_ts_release";
|
||||
"pmx_ts_release";
|
||||
pinctrl-0 = <&ts_active>;
|
||||
pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
|
||||
pinctrl-2 = <&pmx_ts_release>;
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
#include <dt-bindings/gpio/gpio.h>
|
||||
#include <dt-bindings/input/linux-event-codes.h>
|
||||
#include "holi-pmic-overlay-pm6125.dtsi"
|
||||
#include "display/holi-sde-display-cdp-pm6125.dtsi"
|
||||
#include <dt-bindings/iio/qti_power_supply_iio.h>
|
||||
|
||||
/* Dummy LDO reference */
|
||||
|
|
@ -203,6 +204,36 @@
|
|||
qcom,cl-feedback-on;
|
||||
};
|
||||
|
||||
&tlmm {
|
||||
touch_avdd_default: touch_avdd_default {
|
||||
mux {
|
||||
pins = "gpio53";
|
||||
function = "gpio";
|
||||
};
|
||||
|
||||
config {
|
||||
pins = "gpio53";
|
||||
drive-strength = <8>;
|
||||
bias-disable = <0>;
|
||||
output-high;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&soc {
|
||||
touch_avdd: touch_avdd {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "touch_avdd";
|
||||
regulator-min-microvolt = <2800000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
regulator-enable-ramp-delay = <233>;
|
||||
gpio = <&tlmm 53 0>;
|
||||
enable-active-high;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&touch_avdd_default>;
|
||||
};
|
||||
};
|
||||
|
||||
&qupv3_se8_i2c {
|
||||
status = "okay";
|
||||
qcom,i2c-touch-active="synaptics,tcm-i2c";
|
||||
|
|
@ -217,8 +248,8 @@
|
|||
pinctrl-0 = <&ts_active>;
|
||||
pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
|
||||
pinctrl-2 = <&pmx_ts_release>;
|
||||
vdd-supply = <&L11A>;
|
||||
avdd-supply = <&L6A>;
|
||||
vdd-supply = <&L9A>;
|
||||
avdd-supply = <&touch_avdd>;
|
||||
synaptics,pwr-reg-name = "avdd";
|
||||
synaptics,bus-reg-name = "vdd";
|
||||
synaptics,irq-gpio = <&tlmm 22 0x2008>;
|
||||
|
|
@ -231,6 +262,9 @@
|
|||
synaptics,ubl-i2c-addr = <0x20>;
|
||||
synaptics,extend_report;
|
||||
synaptics,firmware-name = "synaptics_firmware.img";
|
||||
|
||||
panel = <&dsi_rm69299_visionox_amoled_video
|
||||
&dsi_rm69299_visionox_amoled_cmd>;
|
||||
};
|
||||
|
||||
focaltech@38 {
|
||||
|
|
@ -243,7 +277,7 @@
|
|||
focaltech,max-touch-number = <5>;
|
||||
focaltech,display-coords = <0 0 1080 2340>;
|
||||
|
||||
vdd-supply = <&L6A>;
|
||||
vdd-supply = <&touch_avdd>;
|
||||
|
||||
pinctrl-names = "pmx_ts_active", "pmx_ts_suspend",
|
||||
"pmx_ts_release";
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
#include <dt-bindings/gpio/gpio.h>
|
||||
#include <dt-bindings/input/linux-event-codes.h>
|
||||
#include "holi-pmic-overlay-pm6125.dtsi"
|
||||
#include "display/holi-sde-display-mtp-pm6125.dtsi"
|
||||
#include <dt-bindings/iio/qti_power_supply_iio.h>
|
||||
|
||||
/* Dummy LDO reference */
|
||||
|
|
@ -128,6 +129,36 @@
|
|||
};
|
||||
};
|
||||
|
||||
&tlmm {
|
||||
touch_avdd_default: touch_avdd_default {
|
||||
mux {
|
||||
pins = "gpio53";
|
||||
function = "gpio";
|
||||
};
|
||||
|
||||
config {
|
||||
pins = "gpio53";
|
||||
drive-strength = <8>;
|
||||
bias-disable = <0>;
|
||||
output-high;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&soc {
|
||||
touch_avdd: touch_avdd {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "touch_avdd";
|
||||
regulator-min-microvolt = <2800000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
regulator-enable-ramp-delay = <233>;
|
||||
gpio = <&tlmm 53 0>;
|
||||
enable-active-high;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&touch_avdd_default>;
|
||||
};
|
||||
};
|
||||
|
||||
&qupv3_se8_i2c {
|
||||
status = "okay";
|
||||
qcom,i2c-touch-active="synaptics,tcm-i2c";
|
||||
|
|
@ -142,8 +173,8 @@
|
|||
pinctrl-0 = <&ts_active>;
|
||||
pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
|
||||
pinctrl-2 = <&pmx_ts_release>;
|
||||
vdd-supply = <&L11A>;
|
||||
avdd-supply = <&L6A>;
|
||||
vdd-supply = <&L9A>;
|
||||
avdd-supply = <&touch_avdd>;
|
||||
synaptics,pwr-reg-name = "avdd";
|
||||
synaptics,bus-reg-name = "vdd";
|
||||
synaptics,irq-gpio = <&tlmm 22 0x2008>;
|
||||
|
|
@ -156,6 +187,9 @@
|
|||
synaptics,ubl-i2c-addr = <0x20>;
|
||||
synaptics,extend_report;
|
||||
synaptics,firmware-name = "synaptics_firmware.img";
|
||||
|
||||
panel = <&dsi_rm69299_visionox_amoled_video
|
||||
&dsi_rm69299_visionox_amoled_cmd>;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
#include <dt-bindings/gpio/gpio.h>
|
||||
#include <dt-bindings/input/linux-event-codes.h>
|
||||
#include "holi-pmic-overlay-pm6125.dtsi"
|
||||
#include "display/holi-sde-display-mtp-pm6125.dtsi"
|
||||
#include <dt-bindings/iio/qti_power_supply_iio.h>
|
||||
|
||||
/* Dummy LDO reference */
|
||||
|
|
@ -147,6 +148,36 @@
|
|||
};
|
||||
};
|
||||
|
||||
&tlmm {
|
||||
touch_avdd_default: touch_avdd_default {
|
||||
mux {
|
||||
pins = "gpio53";
|
||||
function = "gpio";
|
||||
};
|
||||
|
||||
config {
|
||||
pins = "gpio53";
|
||||
drive-strength = <8>;
|
||||
bias-disable = <0>;
|
||||
output-high;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&soc {
|
||||
touch_avdd: touch_avdd {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "touch_avdd";
|
||||
regulator-min-microvolt = <2800000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
regulator-enable-ramp-delay = <233>;
|
||||
gpio = <&tlmm 53 0>;
|
||||
enable-active-high;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&touch_avdd_default>;
|
||||
};
|
||||
};
|
||||
|
||||
&qupv3_se8_i2c {
|
||||
status = "okay";
|
||||
qcom,i2c-touch-active="synaptics,tcm-i2c";
|
||||
|
|
@ -161,8 +192,8 @@
|
|||
pinctrl-0 = <&ts_active>;
|
||||
pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
|
||||
pinctrl-2 = <&pmx_ts_release>;
|
||||
vdd-supply = <&L11A>;
|
||||
avdd-supply = <&L6A>;
|
||||
vdd-supply = <&L9A>;
|
||||
avdd-supply = <&touch_avdd>;
|
||||
synaptics,pwr-reg-name = "avdd";
|
||||
synaptics,bus-reg-name = "vdd";
|
||||
synaptics,irq-gpio = <&tlmm 22 0x2008>;
|
||||
|
|
@ -175,6 +206,9 @@
|
|||
synaptics,ubl-i2c-addr = <0x20>;
|
||||
synaptics,extend_report;
|
||||
synaptics,firmware-name = "synaptics_firmware.img";
|
||||
|
||||
panel = <&dsi_rm69299_visionox_amoled_video
|
||||
&dsi_rm69299_visionox_amoled_cmd>;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,10 @@
|
|||
/* Dummy LDO referenses */
|
||||
|
||||
&mdss_dsi_phy0 {
|
||||
vdda-0p9-supply = <&S6A>;
|
||||
vdda-0p9-supply = <&S1E_LEVEL>;
|
||||
};
|
||||
|
||||
&mdss_dsi0 {
|
||||
vdda-1p2-supply = <&L4A>;
|
||||
};
|
||||
|
||||
&soc {
|
||||
|
|
|
|||
Loading…
Reference in a new issue