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

Commit 082edf13 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 AQT1000 audio routings on SDM855 target"

parents 61f311fb c5f8d164
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -1041,7 +1041,7 @@ Example of child node that would have qcom,wdsp-cmpnt-dev-name property
* SDM855 ASoC Machine driver

Required properties:
- compatible : "qcom,sdm855-asoc-snd-pahu"
- compatible : "qcom,sdm855-asoc-snd-pahu-aqt"
- qcom,model : The user-visible name of this sound card.
- qcom,pahu-ext-clk-freq : External CLK frequency value for pahu codec
- qcom,audio-routing : A list of the connections between audio components.
@@ -1073,8 +1073,8 @@ Optional properties:
Example:

	sound-pahu {
		compatible = "qcom,sdm855-asoc-snd-pahu";
		qcom,model = "sdm855-pahu-snd-card";
		compatible = "qcom,sdm855-asoc-snd-pahu-aqt";
		qcom,model = "sdm855-pahu-aqt-snd-card";
		qcom,ext-disp-audio-rx;
		qcom,wcn-btfm;
		qcom,mi2s-audio-intf;
+7 −0
Original line number Diff line number Diff line
@@ -23,6 +23,13 @@
		"AMIC4", "MIC BIAS2",
		"AMIC5", "MIC BIAS3",
		"MIC BIAS3", "Handset Mic",
		"AMIC2", "AQT MIC BIAS1",
		"AQT MIC BIAS1", "Headset Mic",
		"AQT AMIC3", "AQT MIC BIAS1",
		"AQT AMIC1", "AQT MIC BIAS1",
		"AQT MIC BIAS1", "ANCLeft Headset Mic",
		"AQT AMIC2", "AQT MIC BIAS1",
		"AQT MIC BIAS1", "ANCRight Headset Mic",
		"DMIC0", "MIC BIAS1",
		"MIC BIAS1", "Digital Mic0",
		"DMIC1", "MIC BIAS1",
+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@
	};

	snd_9360: sound-pahu {
		compatible = "qcom,sdm855-asoc-snd-pahu";
		qcom,model = "sdm855-pahu-snd-card";
		compatible = "qcom,sdm855-asoc-snd-pahu-aqt";
		qcom,model = "sdm855-pahu-aqt-snd-card";
		qcom,mi2s-audio-intf;
		qcom,auxpcm-audio-intf;