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

Commit 589a4126 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: configure gpio on cti map and unmap on 8084"

parents e44d09b9 a8e881b4

arch/arm/boot/dts/qcom/apq8084-coresight.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -326,7 +326,8 @@ 
		coresight-name = "coresight-cti6";

		coresight-nr-inports = <0>;



		pinctrl-names = "default";

		qcom,cti-gpio-trigout = <2>;

		pinctrl-names = "cti-trigout-pctrl";

		pinctrl-0 = <&trigout_a>;

	};

arch/arm/boot/dts/qcom/apq8084-pinctrl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -628,7 +628,7 @@ 
			qcom,num-grp-pins = <1>;

			qcom,pin-func = <5>;

			label = "cti-trigout-a";

			trigout_a: default {

			trigout_a: trigout_a {

				drive-strength = <2>;

				bias-disable;

			};