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

Commit 7fac284c 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 rpm cti entry for msm8937"

parents 17de6618 1083e57b

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

+26 −11
Original line number Diff line number Diff line
@@ -793,11 +793,26 @@ 
		clock-names = "core_clk", "core_a_clk";

	};



	/* RPM CTI */

	cti_rpm_cpu0: cti@610c000 {

		compatible = "arm,coresight-cti";

		reg = <0x610c000 0x1000>;

		reg-names = "cti-base";



		coresight-id = <47>;

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

		coresight-nr-inports = <0>;



		clocks = <&clock_gcc clk_qdss_clk>,

			 <&clock_gcc clk_qdss_a_clk>;

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

	};



	/* Proto ETM */

	wcn_etm0 {

		compatible = "qcom,coresight-remote-etm";



		coresight-id = <47>;

		coresight-id = <48>;

		coresight-name = "coresight-wcn-etm0";

		coresight-nr-inports = <0>;

		coresight-outports = <0>;
@@ -810,7 +825,7 @@ 
	rpm_etm0 {

		compatible = "qcom,coresight-remote-etm";



		coresight-id = <48>;

		coresight-id = <49>;

		coresight-name = "coresight-rpm-etm0";

		coresight-nr-inports = <0>;

		coresight-outports = <0>;
@@ -824,7 +839,7 @@ 
	audio_etm0 {

		compatible = "qcom,coresight-remote-etm";



		coresight-id = <49>;

		coresight-id = <50>;

		coresight-name = "coresight-audio-etm0";

		coresight-nr-inports = <0>;

		coresight-outports = <0>;
@@ -837,7 +852,7 @@ 
	modem_etm0 {

		compatible = "qcom,coresight-remote-etm";



		coresight-id = <50>;

		coresight-id = <51>;

		coresight-name = "coresight-modem-etm0";

		coresight-nr-inports = <0>;

		coresight-outports = <0>;
@@ -852,7 +867,7 @@ 
		reg = <0x6001000 0x1000>;

		reg-names = "csr-base";



		coresight-id = <51>;

		coresight-id = <52>;

		coresight-name = "coresight-csr";

		coresight-nr-inports = <0>;

		qcom,blk-size = <1>;
@@ -867,7 +882,7 @@ 
		reg = <0x6108000 0x1000>;

		reg-names = "dbgui-base";



		coresight-id = <52>;

		coresight-id = <53>;

		coresight-name = "coresight-dbgui";

		coresight-nr-inports = <0>;

		coresight-outports = <0>;
@@ -888,7 +903,7 @@ 
		reg = <0x6003000 0x1000>;

		reg-names = "tpda-base";



		coresight-id = <52>;

		coresight-id = <54>;

		coresight-name = "coresight-tpda";

		coresight-nr-inports = <2>;

		coresight-outports = <0>;
@@ -908,7 +923,7 @@ 
		reg = <0x6110000 0x1000>;

		reg-names = "tpdm-base";



		coresight-id = <53>;

		coresight-id = <55>;

		coresight-name = "coresight-tpdm-dcc";

		coresight-nr-inports = <1>;

		coresight-outports = <0>;
@@ -935,7 +950,7 @@ 
			    "mm-wrapper-mux", "mm-wrapper-lockaccess",

			    "usbbam-mux", "blsp-mux";



		coresight-id = <54>;

		coresight-id = <56>;

		coresight-name = "coresight-hwevent";

		coresight-nr-inports = <0>;
@@ -951,7 +966,7 @@ 
		      <0xa600c 0x4>;

		reg-names = "fuse-base", "nidnt-fuse-base", "qpdi-fuse-base";



		coresight-id = <55>;

		coresight-id = <57>;

		coresight-name = "coresight-fuse";

		coresight-nr-inports = <0>;

	};
@@ -961,7 +976,7 @@ 
		reg = <0x1941000 0x4>;

		reg-names = "qpdi-base";



		coresight-id = <56>;

		coresight-id = <58>;

		coresight-name = "coresight-qpdi";

		coresight-nr-inports = <0>;