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

Commit ba8c27db 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: change the max number of touches for MSM8909"

parents 1f84d2af 9711cac2

arch/arm/boot/dts/qcom/msm8909-qrd-skua.dtsi

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2015, 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
@@ -43,7 +43,7 @@ 
			focaltech,group-id = <1>;

			focaltech,hard-reset-delay-ms = <20>;

			focaltech,soft-reset-delay-ms = <200>;

			focaltech,num-max-touches = <5>;

			focaltech,num-max-touches = <2>;

			focaltech,fw-delay-aa-ms = <30>;

			focaltech,fw-delay-55-ms = <30>;

			focaltech,fw-upgrade-id1 = <0x79>;

arch/arm/boot/dts/qcom/msm8909-qrd-skuc.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ 
			focaltech,group-id = <1>;

			focaltech,hard-reset-delay-ms = <20>;

			focaltech,soft-reset-delay-ms = <200>;

			focaltech,num-max-touches = <5>;

			focaltech,num-max-touches = <2>;

			focaltech,fw-delay-aa-ms = <30>;

			focaltech,fw-delay-55-ms = <30>;

			focaltech,fw-upgrade-id1 = <0x79>;

arch/arm/boot/dts/qcom/msm8909-qrd-skue.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ 
			focaltech,group-id = <1>;

			focaltech,hard-reset-delay-ms = <20>;

			focaltech,soft-reset-delay-ms = <200>;

			focaltech,num-max-touches = <5>;

			focaltech,num-max-touches = <2>;

			focaltech,fw-delay-aa-ms = <30>;

			focaltech,fw-delay-55-ms = <30>;

			focaltech,fw-upgrade-id1 = <0x79>;