From 4f1fbcfd7be53ccadfc6badf9032771f60e4d1ca Mon Sep 17 00:00:00 2001 From: Rajeev Nandan Date: Sun, 2 Aug 2020 21:05:54 +0530 Subject: [PATCH 1/2] ARM: dts: msm: include display nodes to Holi target This change includes display sde node and platform specific nodes in the corresponding platform DT files for Holi target. Change-Id: I289312901f2763e14d8b9a6234311e56afe381e9 --- qcom/holi-atp.dtsi | 1 + qcom/holi-cdp.dtsi | 1 + qcom/holi-mtp.dtsi | 1 + qcom/holi.dtsi | 1 + 4 files changed, 4 insertions(+) diff --git a/qcom/holi-atp.dtsi b/qcom/holi-atp.dtsi index 7e021fcf..78e26728 100644 --- a/qcom/holi-atp.dtsi +++ b/qcom/holi-atp.dtsi @@ -1,6 +1,7 @@ #include #include #include "holi-pmic-overlay.dtsi" +#include "display/holi-sde-display-atp.dtsi" #include "holi-thermal-overlay.dtsi" &ufsphy_mem { diff --git a/qcom/holi-cdp.dtsi b/qcom/holi-cdp.dtsi index 165b9c75..db5fe4f9 100644 --- a/qcom/holi-cdp.dtsi +++ b/qcom/holi-cdp.dtsi @@ -2,6 +2,7 @@ #include #include #include "holi-pmic-overlay.dtsi" +#include "display/holi-sde-display-cdp.dtsi" #include "holi-thermal-overlay.dtsi" &ufsphy_mem { diff --git a/qcom/holi-mtp.dtsi b/qcom/holi-mtp.dtsi index 165b9c75..2f1b6b87 100644 --- a/qcom/holi-mtp.dtsi +++ b/qcom/holi-mtp.dtsi @@ -2,6 +2,7 @@ #include #include #include "holi-pmic-overlay.dtsi" +#include "display/holi-sde-display-mtp.dtsi" #include "holi-thermal-overlay.dtsi" &ufsphy_mem { diff --git a/qcom/holi.dtsi b/qcom/holi.dtsi index 1f6ce069..1cd53122 100644 --- a/qcom/holi.dtsi +++ b/qcom/holi.dtsi @@ -2383,6 +2383,7 @@ #include "holi-thermal.dtsi" #include "holi-pinctrl.dtsi" #include "holi-qupv3.dtsi" +#include "display/holi-sde.dtsi" #include "holi-audio.dtsi" &gcc_camss_top_gdsc { From caa2bb035a7c826217a31bf79cc320d39ced3efe Mon Sep 17 00:00:00 2001 From: Ritesh Kumar Date: Thu, 23 Jul 2020 15:08:54 +0530 Subject: [PATCH 2/2] ARM: dts: msm: add touch support for holi target This change adds synaptics tcm driver touch support for holi target. Change-Id: Iad7cd5d04415a5b78c3eda15861529c9032ca496 --- qcom/holi-atp.dtsi | 33 +++++++++++++++++++++++ qcom/holi-cdp.dtsi | 33 +++++++++++++++++++++++ qcom/holi-mtp.dtsi | 33 +++++++++++++++++++++++ qcom/holi-pinctrl.dtsi | 60 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 159 insertions(+) diff --git a/qcom/holi-atp.dtsi b/qcom/holi-atp.dtsi index 78e26728..510ae7ae 100644 --- a/qcom/holi-atp.dtsi +++ b/qcom/holi-atp.dtsi @@ -92,3 +92,36 @@ &pm6150a_amoled { status = "ok"; }; + +&qupv3_se8_i2c { + status = "okay"; + qcom,i2c-touch-active="synaptics,tcm-i2c"; + + synaptics_tcm@20 { + compatible = "synaptics,tcm-i2c"; + reg = <0x20>; + interrupt-parent = <&tlmm>; + interrupts = <22 0x2008>; + 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 = <&pmx_ts_release>; + vdd-supply = <&L11A>; + avdd-supply = <&L6A>; + synaptics,pwr-reg-name = "avdd"; + synaptics,bus-reg-name = "vdd"; + synaptics,irq-gpio = <&tlmm 22 0x2008>; + synaptics,irq-on-state = <0>; + synaptics,reset-gpio = <&tlmm 21 0x00>; + synaptics,reset-on-state = <0>; + synaptics,reset-active-ms = <20>; + synaptics,reset-delay-ms = <200>; + synaptics,power-delay-ms = <200>; + synaptics,ubl-i2c-addr = <0x20>; + synaptics,extend_report; + synaptics,firmware-name = "synaptics_firmware.img"; + + panel = <&dsi_rm69299_visionox_amoled_video>; + }; +}; diff --git a/qcom/holi-cdp.dtsi b/qcom/holi-cdp.dtsi index db5fe4f9..d9428030 100644 --- a/qcom/holi-cdp.dtsi +++ b/qcom/holi-cdp.dtsi @@ -81,3 +81,36 @@ &pm6150a_amoled { status = "ok"; }; + +&qupv3_se8_i2c { + status = "okay"; + qcom,i2c-touch-active="synaptics,tcm-i2c"; + + synaptics_tcm@20 { + compatible = "synaptics,tcm-i2c"; + reg = <0x20>; + interrupt-parent = <&tlmm>; + interrupts = <22 0x2008>; + 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 = <&pmx_ts_release>; + vdd-supply = <&L11A>; + avdd-supply = <&L6A>; + synaptics,pwr-reg-name = "avdd"; + synaptics,bus-reg-name = "vdd"; + synaptics,irq-gpio = <&tlmm 22 0x2008>; + synaptics,irq-on-state = <0>; + synaptics,reset-gpio = <&tlmm 21 0x00>; + synaptics,reset-on-state = <0>; + synaptics,reset-active-ms = <20>; + synaptics,reset-delay-ms = <200>; + synaptics,power-delay-ms = <200>; + synaptics,ubl-i2c-addr = <0x20>; + synaptics,extend_report; + synaptics,firmware-name = "synaptics_firmware.img"; + + panel = <&dsi_rm69299_visionox_amoled_video>; + }; +}; diff --git a/qcom/holi-mtp.dtsi b/qcom/holi-mtp.dtsi index 2f1b6b87..8b78d976 100644 --- a/qcom/holi-mtp.dtsi +++ b/qcom/holi-mtp.dtsi @@ -81,3 +81,36 @@ &pm6150a_amoled { status = "ok"; }; + +&qupv3_se8_i2c { + status = "okay"; + qcom,i2c-touch-active="synaptics,tcm-i2c"; + + synaptics_tcm@20 { + compatible = "synaptics,tcm-i2c"; + reg = <0x20>; + interrupt-parent = <&tlmm>; + interrupts = <22 0x2008>; + 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 = <&pmx_ts_release>; + vdd-supply = <&L11A>; + avdd-supply = <&L6A>; + synaptics,pwr-reg-name = "avdd"; + synaptics,bus-reg-name = "vdd"; + synaptics,irq-gpio = <&tlmm 22 0x2008>; + synaptics,irq-on-state = <0>; + synaptics,reset-gpio = <&tlmm 21 0x00>; + synaptics,reset-on-state = <0>; + synaptics,reset-active-ms = <20>; + synaptics,reset-delay-ms = <200>; + synaptics,power-delay-ms = <200>; + synaptics,ubl-i2c-addr = <0x20>; + synaptics,extend_report; + synaptics,firmware-name = "synaptics_firmware.img"; + + panel = <&dsi_rm69299_visionox_amoled_video>; + }; +}; diff --git a/qcom/holi-pinctrl.dtsi b/qcom/holi-pinctrl.dtsi index 37f79986..07f202cf 100644 --- a/qcom/holi-pinctrl.dtsi +++ b/qcom/holi-pinctrl.dtsi @@ -664,6 +664,66 @@ }; }; + pmx_ts_active { + ts_active: ts_active { + mux { + pins = "gpio21", "gpio22"; + function = "gpio"; + }; + + config { + pins = "gpio21", "gpio22"; + drive-strength = <8>; + bias-pull-up; + }; + }; + }; + + pmx_ts_int_suspend { + ts_int_suspend: ts_int_suspend { + mux { + pins = "gpio22"; + function = "gpio"; + }; + + config { + pins = "gpio22"; + drive-strength = <2>; + bias-pull-down; + }; + }; + }; + + pmx_ts_reset_suspend { + ts_reset_suspend: ts_reset_suspend { + mux { + pins = "gpio21"; + function = "gpio"; + }; + + config { + pins = "gpio21"; + drive-strength = <2>; + bias-pull-down; + }; + }; + }; + + pmx_ts_release { + pmx_ts_release: pmx_ts_release { + mux { + pins = "gpio21", "gpio22"; + function = "gpio"; + }; + + config { + pins = "gpio21", "gpio22"; + drive-strength = <2>; + bias-disable; + }; + }; + }; + /* Camera GPIOs CCI*/ cci0_active: cci0_active { mux {