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

Commit d90ce990 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: Add qcom,cti-save property for MSM8953"

parents 89f3b1f0 7574e57e

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

+8 −0
Original line number Diff line number Diff line
@@ -890,6 +890,7 @@ 
		reg-names = "cti-base";

		coresight-name = "coresight-cti-cpu0";

		cpu = <&CPU0>;

		qcom,cit-save;



		clocks = <&clock_gcc clk_qdss_clk>,

			 <&clock_gcc clk_qdss_a_clk>;
@@ -904,6 +905,7 @@ 
		reg-names = "cti-base";

		coresight-name = "coresight-cti-cpu1";

		cpu = <&CPU1>;

		qcom,cit-save;



		clocks = <&clock_gcc clk_qdss_clk>,

			 <&clock_gcc clk_qdss_a_clk>;
@@ -918,6 +920,7 @@ 
		reg-names = "cti-base";

		coresight-name = "coresight-cti-cpu2";

		cpu = <&CPU2>;

		qcom,cit-save;



		clocks = <&clock_gcc clk_qdss_clk>,

			 <&clock_gcc clk_qdss_a_clk>;
@@ -932,6 +935,7 @@ 
		reg-names = "cti-base";

		coresight-name = "coresight-cti-cpu3";

		cpu = <&CPU3>;

		qcom,cit-save;



		clocks = <&clock_gcc clk_qdss_clk>,

			 <&clock_gcc clk_qdss_a_clk>;
@@ -946,6 +950,7 @@ 
		reg-names = "cti-base";

		coresight-name = "coresight-cti-cpu4";

		cpu = <&CPU4>;

		qcom,cit-save;



		clocks = <&clock_gcc clk_qdss_clk>,

			 <&clock_gcc clk_qdss_a_clk>;
@@ -960,6 +965,7 @@ 
		reg-names = "cti-base";

		coresight-name = "coresight-cti-cpu5";

		cpu = <&CPU5>;

		qcom,cit-save;



		clocks = <&clock_gcc clk_qdss_clk>,

			 <&clock_gcc clk_qdss_a_clk>;
@@ -974,6 +980,7 @@ 
		reg-names = "cti-base";

		coresight-name = "coresight-cti-cpu6";

		cpu = <&CPU6>;

		qcom,cit-save;



		clocks = <&clock_gcc clk_qdss_clk>,

			 <&clock_gcc clk_qdss_a_clk>;
@@ -988,6 +995,7 @@ 
		reg-names = "cti-base";

		coresight-name = "coresight-cti-cpu7";

		cpu = <&CPU7>;

		qcom,cit-save;



		clocks = <&clock_gcc clk_qdss_clk>,

			 <&clock_gcc clk_qdss_a_clk>;

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

+4 −1
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ 
		reg-names = "cti-base";

		coresight-name = "coresight-cti-cpu4";

		cpu = <&CPU4>;

		qcom,cti-save;



		clocks = <&clock_gcc clk_qdss_clk>,

			 <&clock_gcc clk_qdss_a_clk>;
@@ -118,7 +119,7 @@ 
		reg-names = "cti-base";

		coresight-name = "coresight-cti-cpu5";

		cpu = <&CPU5>;



		qcom,cti-save;

		clocks = <&clock_gcc clk_qdss_clk>,

			 <&clock_gcc clk_qdss_a_clk>;

		clock-names = "apb_pclk";
@@ -132,6 +133,7 @@ 
		reg-names = "cti-base";

		coresight-name = "coresight-cti-cpu6";

		cpu = <&CPU6>;

		qcom,cti-save;



		clocks = <&clock_gcc clk_qdss_clk>,

			 <&clock_gcc clk_qdss_a_clk>;
@@ -146,6 +148,7 @@ 
		reg-names = "cti-base";

		coresight-name = "coresight-cti-cpu7";

		cpu = <&CPU7>;

		qcom,cti-save;



		clocks = <&clock_gcc clk_qdss_clk>,

			 <&clock_gcc clk_qdss_a_clk>;