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

Commit e8bf3b9b 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 APQ8084 devices"

parents 4c60a730 8196618e

arch/arm/boot/dts/apq8084-liquid.dtsi

+9 −9
Original line number Diff line number Diff line
@@ -40,26 +40,26 @@ 
			"Lineout_2 amp", "LINEOUT2",

			"Lineout_4 amp", "LINEOUT4",

			"SPK_ultrasound amp", "SPK_OUT",

			"AMIC1", "MIC BIAS3 External",

			"MIC BIAS3 External", "Analog Mic7",

			"AMIC2", "MIC BIAS2 External",

			"MIC BIAS2 External", "Headset Mic",

			"AMIC3", "MIC BIAS2 External",

			"MIC BIAS2 External", "ANCLeft Headset Mic",

			"AMIC4", "MIC BIAS2 External",

			"MIC BIAS2 External", "ANCRight Headset Mic",

			"AMIC5", "MIC BIAS3 External",

			"MIC BIAS3 External", "Analog Mic7",

			"DMIC1", "MIC BIAS1 External",

			"MIC BIAS1 External", "Digital Mic1",

			"DMIC2", "MIC BIAS4 External",

			"DMIC1", "MIC BIAS4 External",

			"MIC BIAS4 External", "Digital Mic4",

			"DMIC2", "MIC BIAS3 External",

			"MIC BIAS3 External", "Digital Mic3",

			"DMIC3", "MIC BIAS1 External",

			"MIC BIAS1 External", "Digital Mic2",

			"DMIC4", "MIC BIAS3 External",

			"MIC BIAS3 External", "Digital Mic6",

			"DMIC4", "MIC BIAS1 External",

			"MIC BIAS1 External", "Digital Mic1",

			"DMIC5", "MIC BIAS3 External",

			"MIC BIAS3 External", "Digital Mic3",

			"MIC BIAS3 External", "Digital Mic5",

			"DMIC6", "MIC BIAS3 External",

			"MIC BIAS3 External", "Digital Mic5";

			"MIC BIAS3 External", "Digital Mic6";



		qcom,cdc-micbias2-headset-only;

	};

arch/arm/boot/dts/apq8084-mtp.dtsi

+18 −0
Original line number Diff line number Diff line
@@ -31,6 +31,24 @@ 


	sound {

		qcom,model = "apq8084-taiko-mtp-snd-card";



		qcom,audio-routing =

			"RX_BIAS", "MCLK",

			"LDO_H", "MCLK",

			"AIF4 MAD", "MCLK",

			"AMIC1", "MIC BIAS1 Internal1",

			"MIC BIAS1 Internal1", "Handset Mic",

			"AMIC2", "MIC BIAS2 External",

			"MIC BIAS2 External", "Headset Mic",

			"AMIC3", "MIC BIAS2 External",

			"MIC BIAS2 External", "ANCRight Headset Mic",

			"AMIC4", "MIC BIAS2 External",

			"MIC BIAS2 External", "ANCLeft Headset Mic",

			"DMIC1", "MIC BIAS1 External",

			"MIC BIAS1 External", "Digital Mic1",

			"DMIC3", "MIC BIAS3 External",

			"MIC BIAS3 External", "Digital Mic3";



		qcom,cdc-micbias2-headset-only;

		qcom,ext-mclk-gpio  = <&msmgpio 47 0>;

	};

arch/arm/boot/dts/apq8084.dtsi

+8 −8
Original line number Diff line number Diff line
@@ -1752,14 +1752,14 @@ 
			"MIC BIAS2 External", "ANCRight Headset Mic",

			"AMIC4", "MIC BIAS2 External",

			"MIC BIAS2 External", "ANCLeft Headset Mic",

			"DMIC1", "MIC BIAS1 External",

			"MIC BIAS1 External", "Digital Mic1",

			"DMIC2", "MIC BIAS1 External",

			"MIC BIAS1 External", "Digital Mic2",

			"DMIC3", "MIC BIAS3 External",

			"MIC BIAS3 External", "Digital Mic3",

			"DMIC4", "MIC BIAS4 External",

			"MIC BIAS4 External", "Digital Mic4",

			"DMIC1", "MIC BIAS3 External",

			"MIC BIAS3 External", "Digital Mic1",

			"DMIC2", "MIC BIAS4 External",

			"MIC BIAS4 External", "Digital Mic2",

			"DMIC3", "MIC BIAS1 External",

			"MIC BIAS1 External", "Digital Mic3",

			"DMIC4", "MIC BIAS1 External",

			"MIC BIAS1 External", "Digital Mic4",

			"DMIC5", "MIC BIAS3 External",

			"MIC BIAS3 External", "Digital Mic5",

			"DMIC6", "MIC BIAS3 External",