diff --git a/qcom/holi-cdp-lcd-pm6125.dtsi b/qcom/holi-cdp-lcd-pm6125.dtsi index c486e4d2d4a8..dda626b9d06c 100644 --- a/qcom/holi-cdp-lcd-pm6125.dtsi +++ b/qcom/holi-cdp-lcd-pm6125.dtsi @@ -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>; diff --git a/qcom/holi-cdp-pm6125.dtsi b/qcom/holi-cdp-pm6125.dtsi index 5af8a4b33637..b092498fc61a 100644 --- a/qcom/holi-cdp-pm6125.dtsi +++ b/qcom/holi-cdp-pm6125.dtsi @@ -2,6 +2,7 @@ #include #include #include "holi-pmic-overlay-pm6125.dtsi" +#include "display/holi-sde-display-cdp-pm6125.dtsi" #include /* 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"; diff --git a/qcom/holi-mtp-pm6125.dtsi b/qcom/holi-mtp-pm6125.dtsi index 616822dc67d2..24c98800ddab 100644 --- a/qcom/holi-mtp-pm6125.dtsi +++ b/qcom/holi-mtp-pm6125.dtsi @@ -2,6 +2,7 @@ #include #include #include "holi-pmic-overlay-pm6125.dtsi" +#include "display/holi-sde-display-mtp-pm6125.dtsi" #include /* 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>; }; }; diff --git a/qcom/holi-mtp-usbc-pm6125.dtsi b/qcom/holi-mtp-usbc-pm6125.dtsi index e7dc9968edcd..1657c2a1c96c 100644 --- a/qcom/holi-mtp-usbc-pm6125.dtsi +++ b/qcom/holi-mtp-usbc-pm6125.dtsi @@ -2,6 +2,7 @@ #include #include #include "holi-pmic-overlay-pm6125.dtsi" +#include "display/holi-sde-display-mtp-pm6125.dtsi" #include /* 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>; }; }; diff --git a/qcom/holi-pm6125-overlay.dtsi b/qcom/holi-pm6125-overlay.dtsi index 13169520db90..c5fd46d04aa7 100644 --- a/qcom/holi-pm6125-overlay.dtsi +++ b/qcom/holi-pm6125-overlay.dtsi @@ -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 {