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

Commit 7a18c03a 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: Fix MCLK routing for MAD for msm8996"

parents 8fe01a28 7d60e48e

arch/arm/boot/dts/qcom/msm8996-mtp.dtsi

+1 −0
Original line number Original line Diff line number Diff line
@@ -651,6 +651,7 @@ 
		qcom,audio-routing =

		qcom,audio-routing =

			"AIF4 VI", "MCLK",

			"AIF4 VI", "MCLK",

			"RX_BIAS", "MCLK",

			"RX_BIAS", "MCLK",

			"MADINPUT", "MCLK",

			"hifi amp", "LINEOUT1",

			"hifi amp", "LINEOUT1",

			"hifi amp", "LINEOUT2",

			"hifi amp", "LINEOUT2",

			"AMIC2", "MIC BIAS2",

			"AMIC2", "MIC BIAS2",

arch/arm/boot/dts/qcom/msm8996.dtsi

+2 −1
Original line number Original line Diff line number Diff line
@@ -2966,7 +2966,7 @@ 
			"AIF4 VI", "MCLK",

			"AIF4 VI", "MCLK",

			"RX_BIAS", "MCLK",

			"RX_BIAS", "MCLK",

			"LDO_H", "MCLK",

			"LDO_H", "MCLK",

			"AIF4 MAD", "MCLK",

			"MADINPUT", "MCLK",

			"AMIC2", "MIC BIAS2 External",

			"AMIC2", "MIC BIAS2 External",

			"MIC BIAS2 External", "Headset Mic",

			"MIC BIAS2 External", "Headset Mic",

			"AMIC3", "MIC BIAS2 External",

			"AMIC3", "MIC BIAS2 External",
@@ -3030,6 +3030,7 @@ 
		qcom,audio-routing =

		qcom,audio-routing =

			"AIF4 VI", "MCLK",

			"AIF4 VI", "MCLK",

			"RX_BIAS", "MCLK",

			"RX_BIAS", "MCLK",

			"MADINPUT", "MCLK",

			"AMIC2", "MIC BIAS2",

			"AMIC2", "MIC BIAS2",

			"MIC BIAS2", "Headset Mic",

			"MIC BIAS2", "Headset Mic",

			"AMIC3", "MIC BIAS2",

			"AMIC3", "MIC BIAS2",