Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3fcb985 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: use dummy regulator for 3V eLDO supply of touch on Holi"

parents 876b62dc bf88b906

qcom/holi-cdp-pm6125.dtsi

+10 −26
Original line number Diff line number Diff line
@@ -222,33 +222,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>;

	};

};

qcom/holi-mtp-pm6125.dtsi

+10 −26
Original line number Diff line number Diff line
@@ -147,33 +147,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>;

	};

};

qcom/holi-mtp-usbc-pm6125.dtsi

+10 −26
Original line number Diff line number Diff line
@@ -166,33 +166,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>;

	};

};