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

Commit b68fc3a1 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: Connect CTI trig to GPIO on SDM845" into msm-4.9

parents 582d6870 e450813a

Documentation/devicetree/bindings/arm/coresight.txt

+14 −0
Original line number Diff line number Diff line
@@ -141,6 +141,20 @@ its hardware characteristcs. 
	* qcom,msr-fix-req: boolean, indicating if MSRs need to be programmed

	  after enabling the subunit.



* Optional properties for CTI:



	* qcom,cti-gpio-trigin: cti trigger input driven by gpio.



	* qcom,cti-gpio-trigout: cti trigger output sent to gpio.



	* pinctrl-names: names corresponding to the numbered pinctrl. The

	  allowed names are subset of the following: cti-trigin-pinctrl,

	  cti-trigout-pctrl.



	* pinctrl-<n>: list of pinctrl phandles for the different pinctrl

	  states. Refer to

	  "Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt"



* Required property for Remote ETMs:



	* qcom,inst-id: must be present. QMI instance id for remote ETMs.

arch/arm64/boot/dts/qcom/sdm845-coresight.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -1437,6 +1437,10 @@ 


		clocks = <&clock_aop QDSS_CLK>;

		clock-names = "apb_pclk";



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

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

		pinctrl-0 = <&trigout_a>;

	};



	cti3: cti@6013000 {

arch/arm64/boot/dts/qcom/sdm845-pinctrl.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -2558,6 +2558,18 @@ 
				drive-strength = <2>; /* 2 MA */

			};

		};



		trigout_a: trigout_a {

			mux {

				pins = "gpio62", "gpio51";

				function = "qdss_cti";

			};

			config {

				pins = "gpio62", "gpio51";

				drive-strength = <2>;

				bias-disable;

			};

		};

	};

};