Merge "arm: dts: add eavb support for DSDA scenario" (8886dfa9) · Commits · e / devices / android_kernel_xiaomi_nabu

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

+9 −4

Original line number	Diff line number	Diff line
		@@ -1388,6 +1388,7 @@ Example:
		"msm-dai-q6-tdm.36880", "msm-dai-q6-tdm.36881",
		"msm-dai-q6-tdm.36896", "msm-dai-q6-tdm.36897",
		"msm-dai-q6-tdm.36912", "msm-dai-q6-tdm.36913";

		asoc-codec = <&stub_codec>, <&ext_disp_audio_codec>;
		asoc-codec-names = "msm-stub-codec.1",
		"msm-ext-disp-audio-codec-rx";
		@@ -1914,7 +1915,8 @@ 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>, <&incall2_record_rx>,
		<&incall_music_2_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",
		@@ -1923,7 +1925,8 @@ 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.32769",
		"msm-dai-q6-dev.32770";
		};

		* SDX ASoC Auto Machine driver
		@@ -1981,7 +1984,8 @@ 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>, <&incall2_record_rx>,
		<&incall_music_2_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",
		@@ -1992,7 +1996,8 @@ 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.32769",
		"msm-dai-q6-dev.32770";
		asoc-codec = <&tlv320aic3x_codec>, <&stub_codec>;
		asoc-codec-names = "tlv320aic3x-codec", "msm-stub-codec.1";
		};

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

+5 −3

Original line number	Diff line number	Diff line
		/* Copyright (c) 2019, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2019-2020 The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -52,7 +52,8 @@
		<&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>, <&incall2_record_rx>,
		<&incall_music_2_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",
		@@ -63,7 +64,8 @@
		"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.32769",
		"msm-dai-q6-dev.32770";
		asoc-codec = <&tlv320aic3x_codec>, <&stub_codec>;
		asoc-codec-names = "tlv320aic3x-codec", "msm-stub-codec.1";
		};

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

+12 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
		* Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -151,6 +151,17 @@
		compatible = "qcom,msm-dai-q6-dev";
		qcom,msm-dai-q6-dev-id = <32773>;
		};

		incall2_record_rx: qcom,msm-dai-q6-incall2-record-rx {
		compatible = "qcom,msm-dai-q6-dev";
		qcom,msm-dai-q6-dev-id = <32769>;
		};

		incall_music_2_rx: qcom,msm-dai-q6-incall-music-2-rx {
		compatible = "qcom,msm-dai-q6-dev";
		qcom,msm-dai-q6-dev-id = <32770>;
		};

		};

		pcm_dtmf: qcom,msm-pcm-dtmf {

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

+5 −3

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -39,7 +39,8 @@
		<&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>, <&incall2_record_rx>,
		<&incall_music_2_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 +51,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.32769",
		"msm-dai-q6-dev.32770";
		};
		};