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

Commit d3ec11ff 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: Update audio routing for SBC8096"

parents 62fc063d f21cbc05

arch/arm/boot/dts/qcom/apq8096-sbc.dtsi

+12 −16
Original line number Diff line number Diff line
@@ -569,30 +569,28 @@ 


		qcom,audio-routing =

			"RX_BIAS", "MCLK",

			"AMIC1", "MIC BIAS3",

			"MIC BIAS3", "Analog Mic4",

			"AMIC1", "MIC BIAS2",

			"MIC BIAS2", "Headset Mic",

			"AMIC2", "MIC BIAS2",

			"MIC BIAS2", "Headset Mic",

			"AMIC3", "MIC BIAS2",

			"MIC BIAS2", "ANCLeft Headset Mic",

			"AMIC4", "MIC BIAS2",

			"MIC BIAS2", "ANCRight Headset Mic",

			"AMIC5", "MIC BIAS3",

			"MIC BIAS3", "Analog Mic6",

			"AMIC6", "MIC BIAS4",

			"MIC BIAS4", "Analog Mic7",

			"DMIC0", "MIC BIAS1",

			"MIC BIAS1", "Digital Mic0",

			"DMIC1", "MIC BIAS3",

			"MIC BIAS3", "Digital Mic1",

			"DMIC2", "MIC BIAS4",

			"MIC BIAS4", "Digital Mic2",

			"AMIC5", "MIC BIAS2",

			"MIC BIAS2", "Analog Mic6",

			"AMIC6", "MIC BIAS2",

			"MIC BIAS2", "Analog Mic7",

			"DMIC2", "MIC BIAS1",

			"MIC BIAS1", "Digital Mic2",

			"DMIC3", "MIC BIAS1",

			"MIC BIAS1", "Digital Mic3",

			"DMIC4", "MIC BIAS3",

			"MIC BIAS3", "Digital Mic4",

			"DMIC5", "MIC BIAS4",

			"MIC BIAS4", "Digital Mic5";

			"DMIC5", "MIC BIAS3",

			"MIC BIAS3", "Digital Mic5",

			"SpkrLeft IN", "SPK1 OUT",

			"SpkrRight IN", "SPK2 OUT";



		qcom,hdmi-audio-rx;

		asoc-codec = <&stub_codec>, <&hdmi_audio>;
@@ -810,11 +808,9 @@ 


&slim_msm {

	tasha_codec {

		qcom,cdc-micbias2-headset-only;

		qcom,cdc-micbias1-ext-cap;

		qcom,cdc-micbias2-ext-cap;

		qcom,cdc-micbias3-ext-cap;

		qcom,cdc-micbias4-ext-cap;

	};

};