Merge "ARM: dts: msm: Modify modem etm0 and etm1 connection" (c8effb45) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+97 −4

Original line number	Diff line number	Diff line
		@@ -530,10 +530,88 @@
		};
		port@2 {
		reg = <1>;
		funnel_modem_dl_in_modem_etm0: endpoint {
		funnel_modem_dl_in_modem_etm1: endpoint {
		slave-mode;
		remote-endpoint =
		<&modem_etm0_out_funnel_modem_dl>;
		<&modem_etm1_out_funnel_modem_dl>;
		};
		};
		port@3 {
		reg = <3>;
		funnel_modem_dl_in_funnel_scal_dup: endpoint {
		slave-mode;
		remote-endpoint =
		<&funnel_scal_dup_out_funnel_modem_dl>;
		};
		};
		};
		};

		funnel_scal: funnel@680c000 {
		compatible = "arm,primecell";
		arm,primecell-periphid = <0x0003b908>;

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

		coresight-name = "coresight-funnel-modem-q6";

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

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

		port@0 {
		reg = <0>;
		funnel_scal_out_funnel_scal_dup: endpoint {
		remote-endpoint =
		<&funnel_scal_dup_in_funnel_scal>;
		};
		};
		port@1 {
		reg = <0>;
		funnel_scal_in_modem_etm0: endpoint {
		slave-mode;
		remote-endpoint =
		<&modem_etm0_out_funnel_scal>;
		};
		};
		};
		};

		funnel_scal_dup: funnel@680a000 {
		compatible = "arm,primecell";
		arm,primecell-periphid = <0x0003b908>;

		reg = <0x680a000 0x1>,
		<0x680c000 0x1000>;
		reg-names = "funnel-base-dummy", "funnel-base-real";

		coresight-name = "coresight-funnel-modem-duplicate";

		clocks = <&clock_aop QDSS_CLK>;
		clock-names = "apb_pclk";
		qcom,duplicate-funnel;

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

		port@0 {
		reg = <0>;
		funnel_scal_dup_out_funnel_modem_dl: endpoint {
		remote-endpoint =
		<&funnel_modem_dl_in_funnel_scal_dup>;
		};
		};
		port@1 {
		reg = <1>;
		funnel_scal_dup_in_funnel_scal: endpoint {
		slave-mode;
		remote-endpoint =
		<&funnel_scal_out_funnel_scal_dup>;
		};
		};
		};
		@@ -1164,9 +1242,24 @@
		qcom,inst-id = <2>;

		port {
		modem_etm0_out_funnel_modem_dl: endpoint {
		modem_etm0_out_funnel_scal: endpoint {
		remote-endpoint =
		<&funnel_scal_in_modem_etm0>;
		};
		};
		};


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

		coresight-name = "coresight-modem-etm1";
		qcom,inst-id = <2>;

		port {
		modem_etm1_out_funnel_modem_dl: endpoint {
		remote-endpoint =
		<&funnel_modem_dl_in_modem_etm0>;
		<&funnel_modem_dl_in_modem_etm1>;
		};
		};
		};