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

Commit 7bc0c670 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 cti 6 for gpio 4 use case msm8996"

parents 0a40827c 41f0c562

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

+4 −4
Original line number Diff line number Diff line
@@ -633,6 +633,10 @@ 
		clocks = <&clock_gcc clk_qdss_clk>,

			 <&clock_gcc clk_qdss_a_clk>;

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



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

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

		pinctrl-0 = <&trigout_b>;

	};



	cti7: cti@3017000 {
@@ -661,10 +665,6 @@ 
		clocks = <&clock_gcc clk_qdss_clk>,

			 <&clock_gcc clk_qdss_a_clk>;

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



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

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

		pinctrl-0 = <&trigout_b>;

	};



	cti9: cti@3019000 {

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

+4 −4
Original line number Diff line number Diff line
@@ -683,6 +683,10 @@ 
		clocks = <&clock_gcc clk_qdss_clk>,

			 <&clock_gcc clk_qdss_a_clk>;

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



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

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

		pinctrl-0 = <&trigout_b>;

	};



	cti7: cti@3017000 {
@@ -711,10 +715,6 @@ 
		clocks = <&clock_gcc clk_qdss_clk>,

			 <&clock_gcc clk_qdss_a_clk>;

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



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

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

		pinctrl-0 = <&trigout_b>;

	};



	cti9: cti@3019000 {