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

Commit b041ac4f 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: Enable coresight ssc etm for sm8150" into msm-4.14

parents 39d58207 0fe9dda6
Loading
Loading
Loading
Loading
+58 −2
Original line number Diff line number Diff line
@@ -197,8 +197,15 @@
						<&tmc_etf_swao_in_funnel_swao>;
				};
			};

			port@1 {
				reg = <5>;
				funnel_swao_in_funnel_ssc: endpoint {
					slave-mode;
					remote-endpoint=
						<&funnel_ssc_out_funnel_swao>;
				};
			};
			port@2 {
				reg = <6>;
				funnel_swao_in_replicator1_out: endpoint {
					slave-mode;
@@ -206,7 +213,7 @@
						<&replicator1_out_funnel_swao>;
				};
			};
			port@2 {
			port@3 {
				reg = <7>;
				funnel_swao_in_tpda_swao: endpoint {
					slave-mode;
@@ -2230,6 +2237,20 @@
		};
	};

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

		coresight-name = "coresight-ssc-etm0";
		qcom,inst-id = <8>;

		port {
			ssc_etm0_out_funnel_ssc: endpoint {
				remote-endpoint =
					<&funnel_ssc_in_ssc_etm0>;
			};
		};
	};

	funnel_apss_merg: funnel@7810000 {
		compatible = "arm,primecell";
		arm,primecell-periphid = <0x0003b908>;
@@ -2550,4 +2571,39 @@
			};
		};
	};

	funnel_ssc: funnel@6b14000 {
		compatible = "arm,primecell";
		arm,primecell-periphid = <0x0003b908>;

		reg = <0x6b14000 0x1000>;
		reg-names = "funnel-base";

		coresight-name = "coresight-funnel-ssc";

		clocks = <&clock_aop QDSS_CLK>;
		clock-names = "apb_pclk";

		ports {
			#address-cells = <1>;
			#size-cells = <0>;

			port@0 {
				reg = <0>;
				funnel_ssc_out_funnel_swao: endpoint {
					remote-endpoint =
					    <&funnel_swao_in_funnel_ssc>;
				};
			};

			port@1 {
				reg = <0>;
				funnel_ssc_in_ssc_etm0: endpoint {
					slave-mode;
					remote-endpoint =
					    <&ssc_etm0_out_funnel_ssc>;
				};
			};
		};
	};
};