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

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

Merge "ARM: dts: msm: Add pseudo port entries"

parents 9f008600 7ae7d0f4

Documentation/devicetree/bindings/sound/qcom-audio-dev.txt

+9 −4
Original line number Diff line number Diff line
@@ -743,6 +743,11 @@ Example: 
			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <32770>;

		};



		qcom,msm-dai-q6-incall-music-dl-rx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <32774>;

		};

	};



	qcom,msm-pri-auxpcm {
@@ -2090,7 +2095,7 @@ Example: 
				<&afe_proxy_tx>, <&incall_record_rx>,

				<&incall_record_tx>, <&incall_music_rx>,

				<&dai_sec_auxpcm>, <&incall2_record_rx>,

				<&incall_music_2_rx>;

				<&incall_music_2_rx>, <&incall_music_dl_rx>;

		asoc-cpu-names = "msm-dai-q6-auxpcm.1",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-stub-dev.4", "msm-dai-stub-dev.5",
@@ -2100,7 +2105,7 @@ Example: 
				"msm-dai-q6-dev.240", "msm-dai-q6-dev.32771",

				"msm-dai-q6-dev.32772", "msm-dai-q6-dev.32773",

				"msm-dai-q6-auxpcm.2", "msm-dai-q6-dev.32769",

				"msm-dai-q6-dev.32770";

				"msm-dai-q6-dev.32770", "msm-dai-q6-dev.32774";

	};



* SDX ASoC Auto Machine driver
@@ -2159,7 +2164,7 @@ Example: 
				<&dai_pri_tdm_rx_0>, <&dai_pri_tdm_tx_0>,

				<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_tx_0>,

				<&dai_sec_auxpcm>, <&incall2_record_rx>,

				<&incall_music_2_rx>;

				<&incall_music_2_rx>, <&incall_music_dl_rx>;

		asoc-cpu-names = "msm-dai-q6-auxpcm.1",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-stub-dev.4", "msm-dai-stub-dev.5",
@@ -2171,7 +2176,7 @@ Example: 
				"msm-dai-q6-tdm.36864", "msm-dai-q6-tdm.36865",

				"msm-dai-q6-tdm.36880", "msm-dai-q6-tdm.36881",

				"msm-dai-q6-auxpcm.2", "msm-dai-q6-dev.32769",

				"msm-dai-q6-dev.32770";

				"msm-dai-q6-dev.32770", "msm-dai-q6-dev.32774";

		asoc-codec = <&tlv320aic3x_codec>, <&stub_codec>;

		asoc-codec-names = "tlv320aic3x-codec", "msm-stub-codec.1";

	};

arch/arm64/boot/dts/qcom/sa515m-ccard.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
				<&dai_pri_tdm_rx_0>, <&dai_pri_tdm_tx_0>,

				<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_tx_0>,

				<&dai_sec_auxpcm>, <&incall2_record_rx>,

				<&incall_music_2_rx>;

				<&incall_music_2_rx>, <&incall_music_dl_rx>;

		asoc-cpu-names = "msm-dai-q6-auxpcm.1",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-stub-dev.4", "msm-dai-stub-dev.5",
@@ -65,7 +65,7 @@ 
				"msm-dai-q6-tdm.36864", "msm-dai-q6-tdm.36865",

				"msm-dai-q6-tdm.36880", "msm-dai-q6-tdm.36881",

				"msm-dai-q6-auxpcm.2", "msm-dai-q6-dev.32769",

				"msm-dai-q6-dev.32770";

				"msm-dai-q6-dev.32770", "msm-dai-q6-dev.32774";

		asoc-codec = <&tlv320aic3x_codec>, <&stub_codec>;

		asoc-codec-names = "tlv320aic3x-codec", "msm-stub-codec.1";

		qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>;

arch/arm64/boot/dts/qcom/sdx-audio-lpass.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -169,6 +169,10 @@ 
			qcom,msm-dai-q6-dev-id = <32770>;

		};



		incall_music_dl_rx: qcom,msm-dai-q6-incall-music-dl-rx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <32774>;

		};

	};



	pcm_dtmf: qcom,msm-pcm-dtmf {

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

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
				<&dai_pri_tdm_rx_0>, <&dai_pri_tdm_tx_0>,

				<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_tx_0>,

				<&dai_sec_auxpcm>, <&incall2_record_rx>,

				<&incall_music_2_rx>;

				<&incall_music_2_rx>, <&incall_music_dl_rx>;

		asoc-cpu-names = "msm-dai-q6-auxpcm.1",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-stub-dev.4", "msm-dai-stub-dev.5",
@@ -52,6 +52,6 @@ 
				"msm-dai-q6-tdm.36864", "msm-dai-q6-tdm.36865",

				"msm-dai-q6-tdm.36880", "msm-dai-q6-tdm.36881",

				"msm-dai-q6-auxpcm.2", "msm-dai-q6-dev.32769",

				"msm-dai-q6-dev.32770";

				"msm-dai-q6-dev.32770", "msm-dai-q6-dev.32774";

	};

};