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

Commit 0d0a30dc authored Jan 31, 2019 by qctecmdr Service Committed by Gerrit - the friendly Code Review server Jan 31, 2019

Merge "ARM: dts: msm: remove power regulator for touch driver in trinket"

parents 8062e6c0 0165c3a8

arch/arm64/boot/dts/qcom/trinket-idp.dtsi

+0 −4

Original line number	Diff line number	Diff line
		@@ -313,15 +313,11 @@
		reg = <0x20>;
		interrupt-parent = <&tlmm>;
		interrupts = <88 0x2008>;
		vdd-supply = <&pm6125_l9>;
		avdd-supply = <&pm6125_l21>;
		pinctrl-names = "pmx_ts_active","pmx_ts_suspend",
		"pmx_ts_release";
		pinctrl-0 = <&ts_int_active &ts_reset_active>;
		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
		pinctrl-2 = <&ts_release>;
		synaptics,bus-reg-name = "vdd";
		synaptics,pwr-reg-name = "avdd";
		synaptics,irq-gpio = <&tlmm 88 0x2008>;
		synaptics,irq-on-state = <0>;
		synaptics,reset-gpio = <&tlmm 87 0x00>;

arch/arm64/boot/dts/qcom/trinket-qrd.dtsi

+0 −4

Original line number	Diff line number	Diff line
		@@ -63,15 +63,11 @@
		reg = <0x20>;
		interrupt-parent = <&tlmm>;
		interrupts = <88 0x2008>;
		vdd-supply = <&pm6125_l9>;
		avdd-supply = <&pm6125_l21>;
		pinctrl-names = "pmx_ts_active","pmx_ts_suspend",
		"pmx_ts_release";
		pinctrl-0 = <&ts_int_active &ts_reset_active>;
		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
		pinctrl-2 = <&ts_release>;
		synaptics,bus-reg-name = "vdd";
		synaptics,pwr-reg-name = "avdd";
		synaptics,irq-gpio = <&tlmm 88 0x2008>;
		synaptics,irq-on-state = <0>;
		synaptics,reset-gpio = <&tlmm 87 0x00>;