From 007225a16f76168d63ab98465cce1dac6deb411e Mon Sep 17 00:00:00 2001
From: xsangh <xsang@qti.qualcomm.com>
Date: Fri, 28 Aug 2020 17:50:28 +0800
Subject: [PATCH] ARM: dts: msm: update SHIMA QRD device information

Explicitly disable left WSA to avoid soundwire
enumeration error on QRD SHIMA.

Change-Id: I0815e77ca0028435dbeaeedbaa70385ea7f4c396
---
 qcom/shima-qrd.dtsi | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/qcom/shima-qrd.dtsi b/qcom/shima-qrd.dtsi
index 35beafd3de2e..2526105f6985 100644
--- a/qcom/shima-qrd.dtsi
+++ b/qcom/shima-qrd.dtsi
@@ -220,10 +220,24 @@
 	};
 };
 
+&wsa883x_0221 {
+	status = "disabled";
+};
+
 &shima_snd {
 	qcom,model = "lahaina-shimaqrd-snd-card";
 
 	qcom,audio-routing =
+		"AMIC1", "Analog Mic1",
+		"Analog Mic1", "MIC BIAS3",
+		"AMIC2", "Analog Mic2",
+		"Analog Mic2", "MIC BIAS2",
+		"AMIC3", "Analog Mic3",
+		"Analog Mic3", "MIC BIAS3",
+		"AMIC4", "Analog Mic4",
+		"Analog Mic4", "MIC BIAS1",
+		"AMIC5", "Analog Mic5",
+		"Analog Mic5", "MIC BIAS4",
 		"TX DMIC0", "Digital Mic0",
 		"Digital Mic0", "MIC BIAS1",
 		"TX DMIC1", "Digital Mic1",
@@ -247,7 +261,6 @@
 		"RX_TX DEC1_INP", "TX DEC1 MUX",
 		"RX_TX DEC2_INP", "TX DEC2 MUX",
 		"RX_TX DEC3_INP", "TX DEC3 MUX",
-		"SpkrLeft IN", "WSA_SPK1 OUT",
 		"SpkrRight IN", "WSA_SPK2 OUT",
 		"TX SWR_INPUT", "WCD_TX_OUTPUT",
 		"VA SWR_INPUT", "VA_SWR_CLK",
@@ -260,8 +273,13 @@
 		"VA DMIC2", "Digital Mic2",
 		"VA DMIC3", "Digital Mic3",
 		"VA DMIC4", "Digital Mic4",
-		"VA DMIC5", "Digital Mic5";
-
+		"VA DMIC5", "Digital Mic5",
+		"VA DMIC0", "VA MIC BIAS1",
+		"VA DMIC1", "VA MIC BIAS3",
+		"VA DMIC2", "VA MIC BIAS4",
+		"VA DMIC3", "VA MIC BIAS1",
+		"VA DMIC4", "VA MIC BIAS3",
+		"VA DMIC5", "VA MIC BIAS4";
 	qcom,swr-dmic-max-devs = <0>;
 
 	qcom,cdc-dmic01-gpios = <&cdc_dmic01_gpios>;
@@ -274,10 +292,10 @@
 
 	asoc-codec  = <&stub_codec>, <&bolero>,
 		      <&wcd938x_codec>, <&swr_haptics>,
-		      <&wsa883x_0221>, <&wsa883x_0222>;
+		      <&wsa883x_0222>;
 	asoc-codec-names = "msm-stub-codec.1", "bolero_codec",
 			   "wcd938x_codec", "swr-haptics",
-			   "wsa-codec1", "wsa-codec2";
+			   "wsa-codec2";
 	qcom,wsa-max-devs = <1>;
 	qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>, <&lpi_tlmm>,
 				  <&bolero>;