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

Commit 9c5edce8 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_sti touch node for MSMTITANIUM CDP/MTP"

parents 06e8b5bc 49602ad6

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

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -16,8 +16,8 @@ 


&spi_3 { /* BLSP1 QUP3 */

	spi-max-frequency = <8000000>;

	status = "ok";

	maxim_sti@0 {

		status = "disabled";

		compatible = "maxim,maxim_sti";

		reg = <0>;

		interrupt-parent = <&tlmm>;

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

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -16,8 +16,8 @@ 


&spi_3 { /* BLSP1 QUP3 */

	spi-max-frequency = <16000000>;

	status = "ok";

	maxim_sti@0 {

		status = "disabled";

		compatible = "maxim,maxim_sti";

		reg = <0>;

		interrupt-parent = <&tlmm>;