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

Commit 950627fd 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: correct dtsi properties for CTP on 8916"

parents aa4a451f cc426a83

arch/arm/boot/dts/qcom/msm8916-qrd-skui.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
			pinctrl-0 = <&ts_int_active &ts_reset_active>;

			pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

			focaltech,name = "ft6436";

			focaltech,family-id = <0x14>;

			focaltech,family-id = <0x36>;

			focaltech,reset-gpio = <&msm_gpio 12 0x0>;

			focaltech,irq-gpio = <&msm_gpio 13 0x2008>;

			focaltech,display-coords = <0 0 480 854>;
@@ -41,8 +41,8 @@ 
			focaltech,num-max-touches = <5>;

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

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

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

			focaltech,fw-upgrade-id2 = <0x11>;

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

			focaltech,fw-upgrade-id2 = <0x18>;

			focaltech,fw-delay-readid-ms = <10>;

			focaltech,fw-delay-era-flsh-ms = <2000>;

			focaltech,fw-auto-cal;