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

Commit a8bd8315 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "ARM: dts: msm: disable maxim touch node for MSM8937""

parents 39ed3985 b9160df7
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -319,8 +319,8 @@
};

&spi_3 { /* BLSP1 QUP3 */
	status = "ok";
	maxim_sti@0 {
		status = "disabled";
		compatible = "maxim,maxim_sti";
		reg = <0>;
		interrupt-parent = <&tlmm>;
+1 −1
Original line number Diff line number Diff line
@@ -81,8 +81,8 @@
};

&spi_3 { /* BLSP1 QUP3 */
	status = "ok";
	maxim_sti@0 {
		status = "disabled";
		compatible = "maxim,maxim_sti";
		reg = <0>;
		interrupt-parent = <&tlmm>;