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

Commit 520ca5bf authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: modify audio etm connection"

parents 5f5b3005 476ae2d9
Loading
Loading
Loading
Loading
+10 −42
Original line number Diff line number Diff line
@@ -119,9 +119,9 @@
		qcom,inst-id = <5>;

		port {
			audio_etm0_out_funnel_lpass: endpoint {
			audio_etm0_out_funnel_qatb: endpoint {
				remote-endpoint =
				<&funnel_lpass_in_audio_etm0>;
				<&funnel_qatb_in_audio_etm0>;
			};
		};
	};
@@ -911,38 +911,6 @@
		};
	};

	funnel_lpass: funnel@8a24000 {
		compatible = "arm,primecell";
		arm,primecell-periphid = <0x000bb908>;
		reg = <0x8a24000 0x1000>;
		reg-names = "funnel-base";

		coresight-name = "coresight-funnel-lpass";

		clocks = <&rpmcc RPM_SMD_QDSS_CLK>;
		clock-names = "apb_pclk";
		ports {
			#address-cells = <1>;
			#size-cells = <0>;
			port@0 {
				reg = <0>;
				funnel_lpass_out_funnel_qatb: endpoint {
					remote-endpoint =
					<&funnel_qatb_in_funnel_lpass>;
				};
			};

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

	tpda: tpda@8004000 {
		compatible = "arm,primecell";
		arm,primecell-periphid = <0x000bb969>;
@@ -1092,29 +1060,29 @@
			};

			port@2 {
				reg = <5>;
				funnel_qatb_in_funnel_lpass: endpoint {
				reg = <6>;
				funnel_qatb_in_funnel_turing: endpoint {
					slave-mode;
					remote-endpoint =
					<&funnel_lpass_out_funnel_qatb>;
					<&funnel_turing_out_funnel_qatb>;
				};
			};

			port@3 {
				reg = <6>;
				funnel_qatb_in_funnel_turing: endpoint {
				reg = <5>;
				funnel_qatb_in_tpdm_lpass: endpoint {
					slave-mode;
					remote-endpoint =
					<&funnel_turing_out_funnel_qatb>;
					<&tpdm_lpass_out_funnel_qatb>;
				};
			};

			port@4 {
				reg = <5>;
				funnel_qatb_in_tpdm_lpass: endpoint {
				funnel_qatb_in_audio_etm0: endpoint {
					slave-mode;
					remote-endpoint =
					<&tpdm_lpass_out_funnel_qatb>;
					<&audio_etm0_out_funnel_qatb>;
				};
			};
		};