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

Commit acfdda8d 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"

parents cbcd6c0e 6d702fe7

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

+7 −2
Original line number Diff line number Diff line
@@ -642,6 +642,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 {
@@ -2642,7 +2647,7 @@ Example: 
				<&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",
@@ -2653,7 +2658,7 @@ Example: 
				"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";

	};

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

+5 −0
Original line number Diff line number Diff line
@@ -151,6 +151,11 @@ 
			compatible = "qcom,msm-dai-q6-dev";

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

		};



		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/arm/boot/dts/qcom/sdxpoorwills-audio.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,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",
@@ -50,6 +50,6 @@ 
				"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";

	};

};