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

Commit 0fea4ce6 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: use gpio 25 for cti trigout use case on msm8996"

parents ea92d759 309027d6

arch/arm/boot/dts/qcom/msm8996-coresight-v1.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ 


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

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

		pinctrl-0 = <&trigout_b>;

		pinctrl-0 = <&trigout_a>;

	};



	cti7: cti@3017000 {

arch/arm/boot/dts/qcom/msm8996-coresight-v2.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ 


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

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

		pinctrl-0 = <&trigout_b>;

		pinctrl-0 = <&trigout_a>;

	};



	cti7: cti@3017000 {

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

+4 −4
Original line number Diff line number Diff line
@@ -1591,14 +1591,14 @@ 
			};

		};



		trigout_b: trigout_b {

		trigout_a: trigout_a {

			mux {

				pins = "gpio4";

				function = "qdss_cti_trig_out_b";

				pins = "gpio25";

				function = "qdss_cti_trig_out_a";

			};



			config {

				pins = "gpio4";

				pins = "gpio25";

				drive-strength = <2>;

				bias-disable;

			};