Skip to content

Commit e8acfc1

Browse files
lweiss-fairphoneandersson
authored andcommitted
arm64: dts: qcom: Remove unnecessary MM_[UD]L audio routes
Since commit 6fd8d2d ("ASoC: qcom: qdsp6: Move frontend AIFs to q6asm-dai") from over 4 years ago the audio routes beween MM_DL* + MultiMedia* Playback and MultiMedia* Capture + MM_UL* are not necessary anymore and can be removed from the dts files. It also helps to stop anyone copying these into new dts files. Signed-off-by: Luca Weiss <[email protected]> Reviewed-by: Stephan Gerhold <[email protected]> Reviewed-by: Srinivas Kandagatla <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Bjorn Andersson <[email protected]>
1 parent 3379217 commit e8acfc1

File tree

7 files changed

+6
-28
lines changed

7 files changed

+6
-28
lines changed

arch/arm64/boot/dts/qcom/apq8096-db820c.dts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,10 +1012,7 @@
10121012
&sound {
10131013
compatible = "qcom,apq8096-sndcard";
10141014
model = "DB820c";
1015-
audio-routing = "RX_BIAS", "MCLK",
1016-
"MM_DL1", "MultiMedia1 Playback",
1017-
"MM_DL2", "MultiMedia2 Playback",
1018-
"MultiMedia3 Capture", "MM_UL3";
1015+
audio-routing = "RX_BIAS", "MCLK";
10191016

10201017
mm1-dai-link {
10211018
link-name = "MultiMedia1";

arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,7 @@
156156
&sound {
157157
compatible = "qcom,apq8096-sndcard";
158158
model = "gemini";
159-
audio-routing = "RX_BIAS", "MCLK",
160-
"MM_DL1", "MultiMedia1 Playback",
161-
"MM_DL2", "MultiMedia2 Playback",
162-
"MultiMedia3 Capture", "MM_UL3";
159+
audio-routing = "RX_BIAS", "MCLK";
163160

164161
mm1-dai-link {
165162
link-name = "MultiMedia1";

arch/arm64/boot/dts/qcom/qrb4210-rb2.dts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,6 @@
110110
pinctrl-0 = <&lpi_i2s2_active>;
111111
pinctrl-names = "default";
112112
model = "Qualcomm-RB2-WSA8815-Speakers-DMIC0";
113-
audio-routing = "MM_DL1", "MultiMedia1 Playback",
114-
"MM_DL2", "MultiMedia2 Playback";
115113

116114
mm1-dai-link {
117115
link-name = "MultiMedia1";

arch/arm64/boot/dts/qcom/qrb5165-rb5.dts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,11 +1053,7 @@
10531053
"SpkrLeft IN", "WSA_SPK1 OUT",
10541054
"SpkrRight IN", "WSA_SPK2 OUT",
10551055
"VA DMIC0", "vdd-micb",
1056-
"VA DMIC1", "vdd-micb",
1057-
"MM_DL1", "MultiMedia1 Playback",
1058-
"MM_DL2", "MultiMedia2 Playback",
1059-
"MultiMedia3 Capture", "MM_UL3",
1060-
"MM_DL4", "MultiMedia4 Playback";
1056+
"VA DMIC1", "vdd-micb";
10611057

10621058
mm1-dai-link {
10631059
link-name = "MultiMedia1";

arch/arm64/boot/dts/qcom/sdm845-db845c.dts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -777,11 +777,7 @@
777777
"DMIC2", "MIC BIAS3",
778778
"DMIC3", "MIC BIAS3",
779779
"SpkrLeft IN", "SPK1 OUT",
780-
"SpkrRight IN", "SPK2 OUT",
781-
"MM_DL1", "MultiMedia1 Playback",
782-
"MM_DL2", "MultiMedia2 Playback",
783-
"MM_DL4", "MultiMedia4 Playback",
784-
"MultiMedia3 Capture", "MM_UL3";
780+
"SpkrRight IN", "SPK2 OUT";
785781

786782
mm1-dai-link {
787783
link-name = "MultiMedia1";

arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -632,10 +632,7 @@
632632
"RX_BIAS", "MCLK",
633633
"AMIC2", "MIC BIAS2",
634634
"SpkrLeft IN", "SPK1 OUT",
635-
"SpkrRight IN", "SPK2 OUT",
636-
"MM_DL1", "MultiMedia1 Playback",
637-
"MM_DL3", "MultiMedia3 Playback",
638-
"MultiMedia2 Capture", "MM_UL2";
635+
"SpkrRight IN", "SPK2 OUT";
639636

640637
mm1-dai-link {
641638
link-name = "MultiMedia1";

arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -445,10 +445,7 @@
445445
"RX_BIAS", "MCLK",
446446
"AMIC2", "MIC BIAS2",
447447
"SpkrLeft IN", "SPK1 OUT",
448-
"SpkrRight IN", "SPK2 OUT",
449-
"MM_DL1", "MultiMedia1 Playback",
450-
"MM_DL3", "MultiMedia3 Playback",
451-
"MultiMedia2 Capture", "MM_UL2";
448+
"SpkrRight IN", "SPK2 OUT";
452449

453450
mm1-dai-link {
454451
link-name = "MultiMedia1";

0 commit comments

Comments
 (0)