From bf88b90686fbac8b9f309a24186b779bc2b52887 Mon Sep 17 00:00:00 2001 From: Rajeev Nandan Date: Mon, 24 May 2021 18:00:37 +0530 Subject: [PATCH] ARM: dts: msm: use dummy regulator for 3V eLDO supply of touch on Holi The 3V eLDO controlled by gpio#53 is always ON, to avoid any conflict with the ALS sensor that is also using the same GPIO. Make use of a dummy regulator for the touch 3V supply. Change-Id: Ie40ab4c27a9f10222ce4fbc77f51e65acefeff8b --- qcom/holi-cdp-pm6125.dtsi | 36 ++++++++++------------------------ qcom/holi-mtp-pm6125.dtsi | 36 ++++++++++------------------------ qcom/holi-mtp-usbc-pm6125.dtsi | 36 ++++++++++------------------------ 3 files changed, 30 insertions(+), 78 deletions(-) diff --git a/qcom/holi-cdp-pm6125.dtsi b/qcom/holi-cdp-pm6125.dtsi index 4e49a2f06448..8a5a91161551 100644 --- a/qcom/holi-cdp-pm6125.dtsi +++ b/qcom/holi-cdp-pm6125.dtsi @@ -221,33 +221,17 @@ 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 = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-enable-ramp-delay = <233>; - gpio = <&tlmm 53 0>; - enable-active-high; - pinctrl-names = "default"; - pinctrl-0 = <&touch_avdd_default>; + touch_avdd: touch_avdd_stub { + /* + * Touch eLDO controlled by gpio#53 is always ON. + * Using dummy regulator. + */ + compatible = "qcom,stub-regulator"; + regulator-name = "touch_avdd_stub"; + qcom,hpm-min-load = <10000>; + regulator-min-microvolt = <2700000>; + regulator-max-microvolt = <3544000>; }; }; diff --git a/qcom/holi-mtp-pm6125.dtsi b/qcom/holi-mtp-pm6125.dtsi index 9238fc933bd2..9da75ca360ff 100644 --- a/qcom/holi-mtp-pm6125.dtsi +++ b/qcom/holi-mtp-pm6125.dtsi @@ -146,33 +146,17 @@ }; }; -&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 = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-enable-ramp-delay = <233>; - gpio = <&tlmm 53 0>; - enable-active-high; - pinctrl-names = "default"; - pinctrl-0 = <&touch_avdd_default>; + touch_avdd: touch_avdd_stub { + /* + * Touch eLDO controlled by gpio#53 is always ON. + * Using dummy regulator. + */ + compatible = "qcom,stub-regulator"; + regulator-name = "touch_avdd_stub"; + qcom,hpm-min-load = <10000>; + regulator-min-microvolt = <2700000>; + regulator-max-microvolt = <3544000>; }; }; diff --git a/qcom/holi-mtp-usbc-pm6125.dtsi b/qcom/holi-mtp-usbc-pm6125.dtsi index 7513687694f9..3848a900313c 100644 --- a/qcom/holi-mtp-usbc-pm6125.dtsi +++ b/qcom/holi-mtp-usbc-pm6125.dtsi @@ -165,33 +165,17 @@ }; }; -&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>; + touch_avdd: touch_avdd_stub { + /* + * Touch eLDO controlled by gpio#53 is always ON. + * Using dummy regulator. + */ + compatible = "qcom,stub-regulator"; + regulator-name = "touch_avdd_stub"; + qcom,hpm-min-load = <10000>; + regulator-min-microvolt = <2700000>; + regulator-max-microvolt = <3544000>; }; };