diff mbox series

arm64: dts: qcom: Remove unnecessary MM_[UD]L audio routes

Message ID 20250411-cleanup-mm-routes-v1-1-ba98f653aa69@fairphone.com (mailing list archive)
State Accepted
Commit e8acfc1bbcda6978d952d0c18b0b5cebd6dcc3cf
Headers show
Series arm64: dts: qcom: Remove unnecessary MM_[UD]L audio routes | expand

Commit Message

Luca Weiss April 11, 2025, 8:33 a.m. UTC 
Since commit 6fd8d2d275f7 ("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 <luca.weiss@fairphone.com>
---
 arch/arm64/boot/dts/qcom/apq8096-db820c.dts          | 5 +----
 arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts   | 5 +----
 arch/arm64/boot/dts/qcom/qrb4210-rb2.dts             | 2 --
 arch/arm64/boot/dts/qcom/qrb5165-rb5.dts             | 6 +-----
 arch/arm64/boot/dts/qcom/sdm845-db845c.dts           | 6 +-----
 arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 5 +----
 arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts     | 5 +----
 7 files changed, 6 insertions(+), 28 deletions(-)


---
base-commit: 01c6df60d5d4ae00cd5c1648818744838bba7763
change-id: 20250411-cleanup-mm-routes-7b9e92962553

Best regards,

Comments

Stephan Gerhold April 11, 2025, 8:43 a.m. UTC | #1 
+Cc Srini, Alexey: FYI

On Fri, Apr 11, 2025 at 10:33:29AM +0200, Luca Weiss wrote:
> Since commit 6fd8d2d275f7 ("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 <luca.weiss@fairphone.com>

Thanks, I always forgot/postponed making this cleanup. :-)

Reviewed-by: Stephan Gerhold <stephan.gerhold@linaro.org>

> ---
>  arch/arm64/boot/dts/qcom/apq8096-db820c.dts          | 5 +----
>  arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts   | 5 +----
>  arch/arm64/boot/dts/qcom/qrb4210-rb2.dts             | 2 --
>  arch/arm64/boot/dts/qcom/qrb5165-rb5.dts             | 6 +-----
>  arch/arm64/boot/dts/qcom/sdm845-db845c.dts           | 6 +-----
>  arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 5 +----
>  arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts     | 5 +----
>  7 files changed, 6 insertions(+), 28 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
> index e8148b3d6c50c670d6bc8045e42074162dc1c6d9..1089964e6c0d819e166fd5a959f7f1e6fe688d65 100644
> --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
> +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
> @@ -1012,10 +1012,7 @@ wcd9335: codec@1,0 {
>  &sound {
>  	compatible = "qcom,apq8096-sndcard";
>  	model = "DB820c";
> -	audio-routing = "RX_BIAS", "MCLK",
> -		"MM_DL1",  "MultiMedia1 Playback",
> -		"MM_DL2",  "MultiMedia2 Playback",
> -		"MultiMedia3 Capture", "MM_UL3";
> +	audio-routing = "RX_BIAS", "MCLK";
>  
>  	mm1-dai-link {
>  		link-name = "MultiMedia1";
> diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
> index dbad8f57f2fa34575440caa7f0a19d5893efcfbb..d7fa56808747ae1290b884430d5fa5443bdd9be1 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
> @@ -156,10 +156,7 @@ &slpi_pil {
>  &sound {
>  	compatible = "qcom,apq8096-sndcard";
>  	model = "gemini";
> -	audio-routing = "RX_BIAS", "MCLK",
> -		"MM_DL1",  "MultiMedia1 Playback",
> -		"MM_DL2",  "MultiMedia2 Playback",
> -		"MultiMedia3 Capture", "MM_UL3";
> +	audio-routing = "RX_BIAS", "MCLK";
>  
>  	mm1-dai-link {
>  		link-name = "MultiMedia1";
> diff --git a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
> index d485249bcda44055689b5556eec9dd057b92d0ae..a37860175d2733214f1b257e84d5cb4821033242 100644
> --- a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
> +++ b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
> @@ -110,8 +110,6 @@ sound {
>  		pinctrl-0 = <&lpi_i2s2_active>;
>  		pinctrl-names = "default";
>  		model = "Qualcomm-RB2-WSA8815-Speakers-DMIC0";
> -		audio-routing = "MM_DL1", "MultiMedia1 Playback",
> -				"MM_DL2", "MultiMedia2 Playback";
>  
>  		mm1-dai-link {
>  			link-name = "MultiMedia1";
> diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
> index 4cc14ab1b9ea0f92a12a12ef4df1cdc37bf5591c..dcb998b8b05498d8f9a82ff9a984c1e237a61308 100644
> --- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
> +++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
> @@ -1053,11 +1053,7 @@ &sound {
>  		"SpkrLeft IN", "WSA_SPK1 OUT",
>  		"SpkrRight IN", "WSA_SPK2 OUT",
>  		"VA DMIC0", "vdd-micb",
> -		"VA DMIC1", "vdd-micb",
> -		"MM_DL1",  "MultiMedia1 Playback",
> -		"MM_DL2",  "MultiMedia2 Playback",
> -		"MultiMedia3 Capture", "MM_UL3",
> -		"MM_DL4", "MultiMedia4 Playback";
> +		"VA DMIC1", "vdd-micb";
>  
>  	mm1-dai-link {
>  		link-name = "MultiMedia1";
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> index 2b2ef4dbad2fc55b27fd176baf1b4205802e1c42..adfd916270055df0a957c573868302e0d77c614d 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> @@ -777,11 +777,7 @@ &quat_mi2s_sd2_active
>  		"DMIC2", "MIC BIAS3",
>  		"DMIC3", "MIC BIAS3",
>  		"SpkrLeft IN", "SPK1 OUT",
> -		"SpkrRight IN", "SPK2 OUT",
> -		"MM_DL1",  "MultiMedia1 Playback",
> -		"MM_DL2",  "MultiMedia2 Playback",
> -		"MM_DL4",  "MultiMedia4 Playback",
> -		"MultiMedia3 Capture", "MM_UL3";
> +		"SpkrRight IN", "SPK2 OUT";
>  
>  	mm1-dai-link {
>  		link-name = "MultiMedia1";
> diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
> index e8012205954e76627febda14ee51ecff9d29e4fb..7677acd08e2d176be932d3f726fe5602cf8d50d1 100644
> --- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
> @@ -632,10 +632,7 @@ &sound {
>  		"RX_BIAS", "MCLK",
>  		"AMIC2", "MIC BIAS2",
>  		"SpkrLeft IN", "SPK1 OUT",
> -		"SpkrRight IN", "SPK2 OUT",
> -		"MM_DL1",  "MultiMedia1 Playback",
> -		"MM_DL3",  "MultiMedia3 Playback",
> -		"MultiMedia2 Capture", "MM_UL2";
> +		"SpkrRight IN", "SPK2 OUT";
>  
>  	mm1-dai-link {
>  		link-name = "MultiMedia1";
> diff --git a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts
> index 26217836c2707ba2f7b0030c9801d7de3a797315..d6d4e7184c5603864668057de79c7497ad361ab3 100644
> --- a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts
> @@ -445,10 +445,7 @@ &sound {
>  		"RX_BIAS", "MCLK",
>  		"AMIC2", "MIC BIAS2",
>  		"SpkrLeft IN", "SPK1 OUT",
> -		"SpkrRight IN", "SPK2 OUT",
> -		"MM_DL1",  "MultiMedia1 Playback",
> -		"MM_DL3",  "MultiMedia3 Playback",
> -		"MultiMedia2 Capture", "MM_UL2";
> +		"SpkrRight IN", "SPK2 OUT";
>  
>  	mm1-dai-link {
>  		link-name = "MultiMedia1";
> 
> ---
> base-commit: 01c6df60d5d4ae00cd5c1648818744838bba7763
> change-id: 20250411-cleanup-mm-routes-7b9e92962553
> 
> Best regards,
> -- 
> Luca Weiss <luca.weiss@fairphone.com>
>
Srinivas Kandagatla April 11, 2025, 9:14 a.m. UTC | #2 
On Fri, Apr 11, 2025 at 10:43:26AM +0200, Stephan Gerhold wrote:
> +Cc Srini, Alexey: FYI
> 
> On Fri, Apr 11, 2025 at 10:33:29AM +0200, Luca Weiss wrote:
> > Since commit 6fd8d2d275f7 ("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 <luca.weiss@fairphone.com>
> 
> Thanks, I always forgot/postponed making this cleanup. :-)
> 
> Reviewed-by: Stephan Gerhold <stephan.gerhold@linaro.org>

LGTM

Reviewed-by: Srinivas Kandagatla <srini@kernel.org>

> 
> > ---
> >  arch/arm64/boot/dts/qcom/apq8096-db820c.dts          | 5 +----
> >  arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts   | 5 +----
> >  arch/arm64/boot/dts/qcom/qrb4210-rb2.dts             | 2 --
> >  arch/arm64/boot/dts/qcom/qrb5165-rb5.dts             | 6 +-----
> >  arch/arm64/boot/dts/qcom/sdm845-db845c.dts           | 6 +-----
> >  arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 5 +----
> >  arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts     | 5 +----
> >  7 files changed, 6 insertions(+), 28 deletions(-)
> > 
> > diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
> > index e8148b3d6c50c670d6bc8045e42074162dc1c6d9..1089964e6c0d819e166fd5a959f7f1e6fe688d65 100644
> > --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
> > +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
> > @@ -1012,10 +1012,7 @@ wcd9335: codec@1,0 {
> >  &sound {
> >  	compatible = "qcom,apq8096-sndcard";
> >  	model = "DB820c";
> > -	audio-routing = "RX_BIAS", "MCLK",
> > -		"MM_DL1",  "MultiMedia1 Playback",
> > -		"MM_DL2",  "MultiMedia2 Playback",
> > -		"MultiMedia3 Capture", "MM_UL3";
> > +	audio-routing = "RX_BIAS", "MCLK";
> >  
> >  	mm1-dai-link {
> >  		link-name = "MultiMedia1";
> > diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
> > index dbad8f57f2fa34575440caa7f0a19d5893efcfbb..d7fa56808747ae1290b884430d5fa5443bdd9be1 100644
> > --- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
> > +++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
> > @@ -156,10 +156,7 @@ &slpi_pil {
> >  &sound {
> >  	compatible = "qcom,apq8096-sndcard";
> >  	model = "gemini";
> > -	audio-routing = "RX_BIAS", "MCLK",
> > -		"MM_DL1",  "MultiMedia1 Playback",
> > -		"MM_DL2",  "MultiMedia2 Playback",
> > -		"MultiMedia3 Capture", "MM_UL3";
> > +	audio-routing = "RX_BIAS", "MCLK";
> >  
> >  	mm1-dai-link {
> >  		link-name = "MultiMedia1";
> > diff --git a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
> > index d485249bcda44055689b5556eec9dd057b92d0ae..a37860175d2733214f1b257e84d5cb4821033242 100644
> > --- a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
> > +++ b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
> > @@ -110,8 +110,6 @@ sound {
> >  		pinctrl-0 = <&lpi_i2s2_active>;
> >  		pinctrl-names = "default";
> >  		model = "Qualcomm-RB2-WSA8815-Speakers-DMIC0";
> > -		audio-routing = "MM_DL1", "MultiMedia1 Playback",
> > -				"MM_DL2", "MultiMedia2 Playback";
> >  
> >  		mm1-dai-link {
> >  			link-name = "MultiMedia1";
> > diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
> > index 4cc14ab1b9ea0f92a12a12ef4df1cdc37bf5591c..dcb998b8b05498d8f9a82ff9a984c1e237a61308 100644
> > --- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
> > +++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
> > @@ -1053,11 +1053,7 @@ &sound {
> >  		"SpkrLeft IN", "WSA_SPK1 OUT",
> >  		"SpkrRight IN", "WSA_SPK2 OUT",
> >  		"VA DMIC0", "vdd-micb",
> > -		"VA DMIC1", "vdd-micb",
> > -		"MM_DL1",  "MultiMedia1 Playback",
> > -		"MM_DL2",  "MultiMedia2 Playback",
> > -		"MultiMedia3 Capture", "MM_UL3",
> > -		"MM_DL4", "MultiMedia4 Playback";
> > +		"VA DMIC1", "vdd-micb";
> >  
> >  	mm1-dai-link {
> >  		link-name = "MultiMedia1";
> > diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> > index 2b2ef4dbad2fc55b27fd176baf1b4205802e1c42..adfd916270055df0a957c573868302e0d77c614d 100644
> > --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> > +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> > @@ -777,11 +777,7 @@ &quat_mi2s_sd2_active
> >  		"DMIC2", "MIC BIAS3",
> >  		"DMIC3", "MIC BIAS3",
> >  		"SpkrLeft IN", "SPK1 OUT",
> > -		"SpkrRight IN", "SPK2 OUT",
> > -		"MM_DL1",  "MultiMedia1 Playback",
> > -		"MM_DL2",  "MultiMedia2 Playback",
> > -		"MM_DL4",  "MultiMedia4 Playback",
> > -		"MultiMedia3 Capture", "MM_UL3";
> > +		"SpkrRight IN", "SPK2 OUT";
> >  
> >  	mm1-dai-link {
> >  		link-name = "MultiMedia1";
> > diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
> > index e8012205954e76627febda14ee51ecff9d29e4fb..7677acd08e2d176be932d3f726fe5602cf8d50d1 100644
> > --- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
> > +++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
> > @@ -632,10 +632,7 @@ &sound {
> >  		"RX_BIAS", "MCLK",
> >  		"AMIC2", "MIC BIAS2",
> >  		"SpkrLeft IN", "SPK1 OUT",
> > -		"SpkrRight IN", "SPK2 OUT",
> > -		"MM_DL1",  "MultiMedia1 Playback",
> > -		"MM_DL3",  "MultiMedia3 Playback",
> > -		"MultiMedia2 Capture", "MM_UL2";
> > +		"SpkrRight IN", "SPK2 OUT";
> >  
> >  	mm1-dai-link {
> >  		link-name = "MultiMedia1";
> > diff --git a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts
> > index 26217836c2707ba2f7b0030c9801d7de3a797315..d6d4e7184c5603864668057de79c7497ad361ab3 100644
> > --- a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts
> > +++ b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts
> > @@ -445,10 +445,7 @@ &sound {
> >  		"RX_BIAS", "MCLK",
> >  		"AMIC2", "MIC BIAS2",
> >  		"SpkrLeft IN", "SPK1 OUT",
> > -		"SpkrRight IN", "SPK2 OUT",
> > -		"MM_DL1",  "MultiMedia1 Playback",
> > -		"MM_DL3",  "MultiMedia3 Playback",
> > -		"MultiMedia2 Capture", "MM_UL2";
> > +		"SpkrRight IN", "SPK2 OUT";
> >  
> >  	mm1-dai-link {
> >  		link-name = "MultiMedia1";
> > 
> > ---
> > base-commit: 01c6df60d5d4ae00cd5c1648818744838bba7763
> > change-id: 20250411-cleanup-mm-routes-7b9e92962553
> > 
> > Best regards,
> > -- 
> > Luca Weiss <luca.weiss@fairphone.com>
> >
Bjorn Andersson April 15, 2025, 2:52 a.m. UTC | #3 
On Fri, 11 Apr 2025 10:33:29 +0200, Luca Weiss wrote:
> Since commit 6fd8d2d275f7 ("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.
> 
> 
> [...]

Applied, thanks!

[1/1] arm64: dts: qcom: Remove unnecessary MM_[UD]L audio routes
      commit: e8acfc1bbcda6978d952d0c18b0b5cebd6dcc3cf

Best regards,
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
index e8148b3d6c50c670d6bc8045e42074162dc1c6d9..1089964e6c0d819e166fd5a959f7f1e6fe688d65 100644
--- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
+++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
@@ -1012,10 +1012,7 @@  wcd9335: codec@1,0 {
 &sound {
 	compatible = "qcom,apq8096-sndcard";
 	model = "DB820c";
-	audio-routing = "RX_BIAS", "MCLK",
-		"MM_DL1",  "MultiMedia1 Playback",
-		"MM_DL2",  "MultiMedia2 Playback",
-		"MultiMedia3 Capture", "MM_UL3";
+	audio-routing = "RX_BIAS", "MCLK";
 
 	mm1-dai-link {
 		link-name = "MultiMedia1";
diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
index dbad8f57f2fa34575440caa7f0a19d5893efcfbb..d7fa56808747ae1290b884430d5fa5443bdd9be1 100644
--- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
+++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
@@ -156,10 +156,7 @@  &slpi_pil {
 &sound {
 	compatible = "qcom,apq8096-sndcard";
 	model = "gemini";
-	audio-routing = "RX_BIAS", "MCLK",
-		"MM_DL1",  "MultiMedia1 Playback",
-		"MM_DL2",  "MultiMedia2 Playback",
-		"MultiMedia3 Capture", "MM_UL3";
+	audio-routing = "RX_BIAS", "MCLK";
 
 	mm1-dai-link {
 		link-name = "MultiMedia1";
diff --git a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
index d485249bcda44055689b5556eec9dd057b92d0ae..a37860175d2733214f1b257e84d5cb4821033242 100644
--- a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
+++ b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
@@ -110,8 +110,6 @@  sound {
 		pinctrl-0 = <&lpi_i2s2_active>;
 		pinctrl-names = "default";
 		model = "Qualcomm-RB2-WSA8815-Speakers-DMIC0";
-		audio-routing = "MM_DL1", "MultiMedia1 Playback",
-				"MM_DL2", "MultiMedia2 Playback";
 
 		mm1-dai-link {
 			link-name = "MultiMedia1";
diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
index 4cc14ab1b9ea0f92a12a12ef4df1cdc37bf5591c..dcb998b8b05498d8f9a82ff9a984c1e237a61308 100644
--- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
+++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
@@ -1053,11 +1053,7 @@  &sound {
 		"SpkrLeft IN", "WSA_SPK1 OUT",
 		"SpkrRight IN", "WSA_SPK2 OUT",
 		"VA DMIC0", "vdd-micb",
-		"VA DMIC1", "vdd-micb",
-		"MM_DL1",  "MultiMedia1 Playback",
-		"MM_DL2",  "MultiMedia2 Playback",
-		"MultiMedia3 Capture", "MM_UL3",
-		"MM_DL4", "MultiMedia4 Playback";
+		"VA DMIC1", "vdd-micb";
 
 	mm1-dai-link {
 		link-name = "MultiMedia1";
diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
index 2b2ef4dbad2fc55b27fd176baf1b4205802e1c42..adfd916270055df0a957c573868302e0d77c614d 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
@@ -777,11 +777,7 @@  &quat_mi2s_sd2_active
 		"DMIC2", "MIC BIAS3",
 		"DMIC3", "MIC BIAS3",
 		"SpkrLeft IN", "SPK1 OUT",
-		"SpkrRight IN", "SPK2 OUT",
-		"MM_DL1",  "MultiMedia1 Playback",
-		"MM_DL2",  "MultiMedia2 Playback",
-		"MM_DL4",  "MultiMedia4 Playback",
-		"MultiMedia3 Capture", "MM_UL3";
+		"SpkrRight IN", "SPK2 OUT";
 
 	mm1-dai-link {
 		link-name = "MultiMedia1";
diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
index e8012205954e76627febda14ee51ecff9d29e4fb..7677acd08e2d176be932d3f726fe5602cf8d50d1 100644
--- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
+++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
@@ -632,10 +632,7 @@  &sound {
 		"RX_BIAS", "MCLK",
 		"AMIC2", "MIC BIAS2",
 		"SpkrLeft IN", "SPK1 OUT",
-		"SpkrRight IN", "SPK2 OUT",
-		"MM_DL1",  "MultiMedia1 Playback",
-		"MM_DL3",  "MultiMedia3 Playback",
-		"MultiMedia2 Capture", "MM_UL2";
+		"SpkrRight IN", "SPK2 OUT";
 
 	mm1-dai-link {
 		link-name = "MultiMedia1";
diff --git a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts
index 26217836c2707ba2f7b0030c9801d7de3a797315..d6d4e7184c5603864668057de79c7497ad361ab3 100644
--- a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts
+++ b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts
@@ -445,10 +445,7 @@  &sound {
 		"RX_BIAS", "MCLK",
 		"AMIC2", "MIC BIAS2",
 		"SpkrLeft IN", "SPK1 OUT",
-		"SpkrRight IN", "SPK2 OUT",
-		"MM_DL1",  "MultiMedia1 Playback",
-		"MM_DL3",  "MultiMedia3 Playback",
-		"MultiMedia2 Capture", "MM_UL2";
+		"SpkrRight IN", "SPK2 OUT";
 
 	mm1-dai-link {
 		link-name = "MultiMedia1";