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

Commit 41710f12 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 pseudo port entries for SA415M CCARD"

parents f8eadfe8 5f0f7999

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

+2 −2
Original line number Diff line number Diff line
@@ -2580,7 +2580,7 @@ Example: 
				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,

				<&afe_proxy_tx>, <&incall_record_rx>,

				<&incall_record_tx>, <&incall_music_rx>,

				<&dai_sec_auxpcm>;

				<&dai_sec_auxpcm>, <&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",
@@ -2589,7 +2589,7 @@ Example: 
				"msm-dai-q6-dev.225", "msm-dai-q6-dev.241",

				"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-auxpcm.2", "msm-dai-q6-dev.32774";

	};



* SDX ASoC Auto Machine driver

arch/arm/boot/dts/qcom/sa415m-ccard.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ 
				<&incall_record_tx>, <&incall_music_rx>,

				<&dai_pri_tdm_rx_0>, <&dai_pri_tdm_tx_0>,

				<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_tx_0>,

				<&dai_sec_auxpcm>;

				<&dai_sec_auxpcm>, <&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",
@@ -133,7 +133,7 @@ 
				"msm-dai-q6-dev.32772", "msm-dai-q6-dev.32773",

				"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-auxpcm.2", "msm-dai-q6-dev.32774";

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

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

	};