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

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

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

parents 122fe9b1 2744b25d

arch/arm/boot/dts/qcom/msm8937-cdp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -310,8 +310,8 @@ 
};



&spi_3 { /* BLSP1 QUP3 */

	status = "ok";

	maxim_sti@0 {

		status = "disabled";

		compatible = "maxim,maxim_sti";

		reg = <0>;

		interrupt-parent = <&tlmm>;

arch/arm/boot/dts/qcom/msm8937-mtp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -80,8 +80,8 @@ 
};



&spi_3 { /* BLSP1 QUP3 */

	status = "ok";

	maxim_sti@0 {

		status = "disabled";

		compatible = "maxim,maxim_sti";

		reg = <0>;

		interrupt-parent = <&tlmm>;