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

Commit 787cbc00 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 automotive sound card"

parents 0f7ef974 7bd08469
Loading
Loading
Loading
Loading
+32 −33
Original line number Original line Diff line number Diff line
@@ -605,39 +605,38 @@
	};
	};


	sound-9335 {
	sound-9335 {
		qcom,model = "msm8996-tasha-db-snd-card";
		status = "disabled";

	};
		qcom,audio-routing =

			"RX_BIAS", "MCLK",
	sound-auto {
			"AMIC1", "MIC BIAS3",
		compatible = "qcom,msm8996-asoc-snd-auto";
			"MIC BIAS3", "Analog Mic4",
		qcom,model = "msm8996-auto-snd-card";
			"AMIC2", "MIC BIAS2",

			"MIC BIAS2", "Headset Mic",
		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,
			"AMIC3", "MIC BIAS2",
				<&loopback>, <&compress>, <&hostless>,
			"MIC BIAS2", "ANCLeft Headset Mic",
				<&afe>, <&lsm>, <&routing>, <&cpe>, <&compr>;
			"AMIC4", "MIC BIAS2",
		asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",
			"MIC BIAS2", "ANCRight Headset Mic",
				"msm-pcm-dsp.2", "msm-voip-dsp",
			"AMIC5", "MIC BIAS3",
				"msm-pcm-voice", "msm-pcm-loopback",
			"MIC BIAS3", "Analog Mic6",
				"msm-compress-dsp", "msm-pcm-hostless",
			"AMIC6", "MIC BIAS4",
				"msm-pcm-afe", "msm-lsm-client",
			"MIC BIAS4", "Analog Mic7",
				"msm-pcm-routing", "msm-cpe-lsm",
			"DMIC0", "MIC BIAS1",
				"msm-compr-dsp";
			"MIC BIAS1", "Digital Mic0",
		asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>,
			"DMIC1", "MIC BIAS3",
				<&dai_mi2s>, <&dai_mi2s_quat>,
			"MIC BIAS3", "Digital Mic1",
				<&afe_pcm_rx>, <&afe_pcm_tx>,
			"DMIC2", "MIC BIAS4",
				<&afe_proxy_rx>, <&afe_proxy_tx>,
			"MIC BIAS4", "Digital Mic2",
				<&incall_record_rx>, <&incall_record_tx>,
			"DMIC3", "MIC BIAS1",
				<&incall_music_rx>, <&incall_music2_rx>;
			"MIC BIAS1", "Digital Mic3",
		asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",
			"DMIC4", "MIC BIAS3",
				"msm-dai-q6-hdmi.8",
			"MIC BIAS3", "Digital Mic4",
				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
			"DMIC5", "MIC BIAS4",
				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",
			"MIC BIAS4", "Digital Mic5";
				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",

				"msm-dai-q6-dev.32771", "msm-dai-q6-dev.32772",
		qcom,hdmi-audio-rx;
				"msm-dai-q6-dev.32773", "msm-dai-q6-dev.32770";
		asoc-codec = <&stub_codec>, <&hdmi_audio>;
		asoc-codec = <&stub_codec>;
		asoc-codec-names = "msm-stub-codec.1",
		asoc-codec-names = "msm-stub-codec.1";
					"msm-hdmi-audio-codec-rx";
	};
	};


	usb_detect {
	usb_detect {