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

Commit 43265ea4 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 8994"

parents 589a4126 a67763fe

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

+8 −0
Original line number Diff line number Diff line
@@ -485,6 +485,10 @@ 
		clocks = <&clock_rpm clk_qdss_clk>,

			 <&clock_rpm clk_qdss_a_clk>;

		clock-names = "core_clk", "core_a_clk";



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

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

		pinctrl-0 = <&trigout_a>;

	};



	cti7: cti@fc317000 {
@@ -513,6 +517,10 @@ 
		clocks = <&clock_rpm clk_qdss_clk>,

			 <&clock_rpm clk_qdss_a_clk>;

		clock-names = "core_clk", "core_a_clk";



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

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

		pinctrl-0 = <&trigout_c>;

	};



	cti_cpu0: cti@fb820000 {

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

+22 −0
Original line number Diff line number Diff line
@@ -768,6 +768,28 @@ 
			};

		};



		cti_trigout_a {

			qcom,pins = <&gp 56>;

			qcom,num-grp-pins = <1>;

			qcom,pin-func = <9>;

			label = "cti-trigout-a";

			trigout_a: trigout_a {

				drive-strength = <2>;

				bias-disable;

			};

		};



		cti_trigout_c {

			qcom,pins = <&gp 41>;

			qcom,num-grp-pins = <1>;

			qcom,pin-func = <4>;

			label = "cti-trigout-c";

			trigout_c: trigout_c {

				drive-strength = <2>;

				bias-disable;

			};

		};



		cci0_active {

			/* CLK, DATA */

			qcom,pins = <&gp 17>, <&gp 18>;